Use absolute path when compiling appmodules.so sources

feat(image): [android] adding only-if-cached cache control option (#47348 )
Summary: Following up from https://github.com/facebook/react-native/issues/47182, as basic caching control is already in place in Android, it can be extended to include the `only-if-cached` option. We check whether the image is in the cache. If it is, we proceed to load it. Otherwise, we do nothing. ## Changelog: [ANDROID] [ADDED] - Image `only-if-cached` cache control option Pull Request resolved: https://github.com/facebook/react-native/pull/47348 Test Plan: In the `rn-tester`, I added a third example for Android where the third image will never be loaded as the cache policy is set to `only-if-cached` and the image has not been loaded before. <details> <summary>Video demonstrating how the `only-if-cached` options behaves</summary> https://github.com/user-attachments/assets/45669e81-5414-4103-8931-138bffa81447 </details> <details> <summary>Error from image not found in cache example</summary> <img width="807" alt="image" src="https://github.com/user-attachments/assets/6b79d811-1809-437c-b2fe-c86d3da7c58d"> </details> Reviewed By: rshest Differential Revision: D65384639 Pulled By: Abbondanzo fbshipit-source-id: f4a72694f45eb3d7097c350f4a4008a0abf0a1ab
2025-11-01 09:14:26 +00:00 · 2024-11-04 17:24:32 +00:00 · 2024-11-04 08:37:59 -08:00 · 2024-11-04 08:15:12 -08:00 · 2024-11-04 06:57:47 -08:00 · 2024-11-04 06:53:07 -08:00
271 changed files with 3515 additions and 2814 deletions
@@ -90,4 +90,4 @@ untyped-import
 untyped-type-import

 [version]
-^0.250.0
+^0.251.1
@@ -46,7 +46,7 @@ describe('#publishTemplate', () => {
    expect(github.rest.actions.createWorkflowDispatch).toHaveBeenCalledWith({
      owner: 'react-native-community',
      repo: 'template',
-      workflow_id: 'release.yml',
+      workflow_id: 'release.yaml',
      ref: '0.76-stable',
      inputs: {
        dry_run: true,
@@ -66,7 +66,7 @@ describe('#publishTemplate', () => {
    expect(github.rest.actions.createWorkflowDispatch).toHaveBeenCalledWith({
      owner: 'react-native-community',
      repo: 'template',
-      workflow_id: 'release.yml',
+      workflow_id: 'release.yaml',
      ref: '0.76-stable',
      inputs: {
        dry_run: false,
@@ -42,7 +42,7 @@ module.exports.publishTemplate = async (github, version, dryRun = true) => {
  await github.rest.actions.createWorkflowDispatch({
    owner: 'react-native-community',
    repo: 'template',
-    workflow_id: 'release.yml',
+    workflow_id: 'release.yaml',
    ref,
    inputs: {
      dry_run: dryRun,
@@ -9,7 +9,7 @@

 const {execSync} = require('child_process');

-function run(...cmd) {
+function run(cmd) {
  return execSync(cmd, 'utf8').toString().trim();
 }
 module.exports.run = run;
@@ -21,7 +21,7 @@ module.exports.sleep = sleep;

 async function getNpmPackageInfo(pkg, versionOrTag) {
  return fetch(`https://registry.npmjs.org/${pkg}/${versionOrTag}`).then(resp =>
-    res.json(),
+    resp.json(),
  );
 }
 module.exports.getNpmPackageInfo = getNpmPackageInfo;
@@ -205,9 +205,9 @@ jobs:
        with:
          github-token: ${{ secrets.REACT_NATIVE_BOT_GITHUB_TOKEN }}
          script: |
-            const {verifyPublished, isLatest} = require('./.github/workflow-scripts/publishTemplate.js')
+            const {verifyPublishedTemplate, isLatest} = require('./.github/workflow-scripts/publishTemplate.js')
            const version = "${{ github.ref_name }}"
-            await verifyPublished(version, isLatest());
+            await verifyPublishedTemplate(version, isLatest());
      - name: Update rn-diff-purge to generate upgrade-support diff
        run: |
          curl -X POST https://api.github.com/repos/react-native-community/rn-diff-purge/dispatches \
@@ -1,5 +1,22 @@
 # Changelog

+## v0.76.1
+
+### Fixed
+
+#### Android specific
+
+- **runtime** Made AppRegistry callable from Native code in Bridgeless (fixes headless tasks) ([f3fee67c54](https://github.com/facebook/react-native/commit/f3fee67c547ace5e08bc9e119bcb80e0f3454d30) by [@robik](https://github.com/robik))
+- **runtime** Add jsBundleFile to DefaultReactNativeHost.kt ([e56bd89ef](https://github.com/facebook/react-native/commit/e56bd89eff72f1d38d2940b9dbd8f7b97037dc22))
+
+#### iOS specific
+
+- **codegen** Do not generate the ComponentCls function in the RCTThirdPartyFabricComponentsProvider for components deined in the app. ([dc7e9e2d83](https://github.com/facebook/react-native/commit/dc7e9e2d83f5af3d2a970521af4fcc7f86d2168d) by [@cipolleschi](https://github.com/cipolleschi))
+- **infra** Generated NODE_BINARY in .xcode.env.local now supports paths with a space ([eeaa3ff458](https://github.com/facebook/react-native/commit/eeaa3ff458a3e5c902075bb45161d6ccde31fe53) by [@blakef](https://github.com/blakef))
+- **infra** Pin Xcodeproj to < 1.26.0 ([e8776240b41](https://github.com/facebook/react-native/commit/e8776240b41a3147e95713299b69c813be60b8e8))
+- **runtime** Fixed bug where background colors would sometimes animate when changing on Views ([1d6ac09530](https://github.com/facebook/react-native/commit/1d6ac09530145e6d2bf1e4dd9d40f51542d9e7f6) by [@joevilches](https://github.com/joevilches))
+- **runtime** Fixes regression of RCTWindowFrameDidChangeNotification not fired ([e271b23fad](https://github.com/facebook/react-native/commit/e271b23fad89e1e7da2e91a8f1e5cbb295406c74) by [@zhongwuzw](https://github.com/zhongwuzw))
+
 ## v0.76.0

 ### Breaking
@@ -5,3 +5,4 @@ ruby ">= 2.6.10"

 gem 'cocoapods', '~> 1.13', '!= 1.15.0', '!= 1.15.1'
 gem 'activesupport', '>= 6.1.7.5', '< 7.1.0'
+gem 'xcodeproj', '< 1.26.0'
@@ -14,8 +14,7 @@
    "flow": "flow",
    "format-check": "prettier --list-different \"./**/*.{js,md,yml,ts,tsx}\"",
    "format": "npm run prettier && npm run clang-format",
-    "featureflags-check": "cd packages/react-native && yarn featureflags-check",
-    "featureflags-update": "cd packages/react-native && yarn featureflags-update",
+    "featureflags": "cd packages/react-native && yarn featureflags",
    "lint-ci": "./scripts/circleci/analyze_code.sh && yarn shellcheck",
    "lint-java": "node ./scripts/lint-java.js",
    "lint": "eslint .",
@@ -78,7 +77,7 @@
    "eslint-plugin-redundant-undefined": "^0.4.0",
    "eslint-plugin-relay": "^1.8.3",
    "flow-api-translator": "0.24.0",
-    "flow-bin": "^0.250.0",
+    "flow-bin": "^0.251.1",
    "glob": "^7.1.1",
    "hermes-eslint": "0.24.0",
    "hermes-transform": "0.24.0",
@@ -31,7 +31,7 @@
    "nullthrows": "^1.1.1",
    "open": "^7.0.3",
    "selfsigned": "^2.4.1",
-    "serve-static": "^1.13.1",
+    "serve-static": "^1.16.2",
    "ws": "^6.2.3"
  },
  "engines": {
@@ -39,7 +39,7 @@ module.exports = {
  overrides: [
    {
      files: ['*.js'],
-      parser: 'hermes-eslint',
+      parser: '@babel/eslint-parser',
      plugins: ['ft-flow'],
      rules: {
        // Flow Plugin
@@ -51,7 +51,7 @@ module.exports = {
    },
    {
      files: ['*.jsx'],
-      parser: 'hermes-eslint',
+      parser: '@babel/eslint-parser',
    },
    {
      files: ['*.ts', '*.tsx'],
@@ -21,6 +21,7 @@
  "main": "index.js",
  "dependencies": {
    "@babel/core": "^7.25.2",
+    "@babel/eslint-parser": "^7.25.1",
    "@react-native/eslint-plugin": "0.77.0-main",
    "@typescript-eslint/eslint-plugin": "^7.1.1",
    "@typescript-eslint/parser": "^7.1.1",
@@ -30,8 +31,7 @@
    "eslint-plugin-jest": "^27.9.0",
    "eslint-plugin-react": "^7.30.1",
    "eslint-plugin-react-hooks": "^4.6.0",
-    "eslint-plugin-react-native": "^4.0.0",
-    "hermes-eslint": "0.24.0"
+    "eslint-plugin-react-native": "^4.0.0"
  },
  "peerDependencies": {
    "eslint": ">=8",
@@ -1,5 +1,5 @@
 [versions]
-agp = "8.7.1"
+agp = "8.7.2"
 gson = "2.8.9"
 guava = "31.0.1-jre"
 javapoet = "1.13.0"
@@ -53,11 +53,8 @@ internal object NdkConfiguratorUtils {
        if (cmakeArgs.none { it.startsWith("-DANDROID_STL") }) {
          cmakeArgs.add("-DANDROID_STL=c++_shared")
        }
-        // Due to the new NDK toolchain file, the C++ flags gets overridden between compilation
-        // units. This is causing some libraries to don't be compiled with -DANDROID and other
-        // crucial flags. This can be revisited once we bump to NDK 25/26
-        if (cmakeArgs.none { it.startsWith("-DANDROID_USE_LEGACY_TOOLCHAIN_FILE") }) {
-          cmakeArgs.add("-DANDROID_USE_LEGACY_TOOLCHAIN_FILE=ON")
+        if (cmakeArgs.none { it.startsWith("-DANDROID_SUPPORT_FLEXIBLE_PAGE_SIZES") }) {
+          cmakeArgs.add("-DANDROID_SUPPORT_FLEXIBLE_PAGE_SIZES=ON")
        }

        val architectures = project.getReactNativeArchitectures()
@@ -4,3 +4,4 @@ ruby ">= 2.6.10"

 gem 'cocoapods', '~> 1.13', '!= 1.15.0', '!= 1.15.1'
 gem 'activesupport', '>= 6.1.7.5', '< 7.1.0'
+gem 'xcodeproj', '< 1.26.0'
@@ -387,15 +387,6 @@ const LOG_LEVELS = {
  warn: 2,
  error: 3,
 };
-const INSPECTOR_LEVELS = [];
-INSPECTOR_LEVELS[LOG_LEVELS.trace] = 'debug';
-INSPECTOR_LEVELS[LOG_LEVELS.info] = 'log';
-INSPECTOR_LEVELS[LOG_LEVELS.warn] = 'warning';
-INSPECTOR_LEVELS[LOG_LEVELS.error] = 'error';
-
-// Strip the inner function in getNativeLogFunction(), if in dev also
-// strip method printing to originalConsole.
-const INSPECTOR_FRAMES_TO_SKIP = __DEV__ ? 2 : 1;

 function getNativeLogFunction(level) {
  return function () {
@@ -429,14 +420,6 @@ function getNativeLogFunction(level) {
      // (Note: Logic duplicated in ExceptionsManager.js.)
      logLevel = LOG_LEVELS.warn;
    }
-    if (global.__inspectorLog) {
-      global.__inspectorLog(
-        INSPECTOR_LEVELS[logLevel],
-        str,
-        [].slice.call(arguments),
-        INSPECTOR_FRAMES_TO_SKIP,
-      );
-    }
    if (groupStack.length) {
      str = groupFormat('', str);
    }
@@ -8,9 +8,6 @@
 */

 'use strict';
-
-const {validate: validateChangelog} =
-  require('@rnx-kit/rn-changelog-generator').default;
 const {danger, fail, /*message,*/ warn} = require('danger');
 const includes = require('lodash.includes');

@@ -60,7 +57,9 @@ if (!includesTestPlan && !isFromPhabricator) {

 // Check if there is a changelog and validate it
 if (!isFromPhabricator) {
-  const status = validateChangelog(danger.github.pr.body);
+  const status = require('@rnx-kit/rn-changelog-generator').default.validate(
+    danger.github.pr.body,
+  );
  const changelogInstructions =
    'See <a target="_blank" href="https://reactnative.dev/contributing/changelogs-in-pull-requests">Changelog format</a>';
  if (status === 'missing') {
@@ -496,7 +496,9 @@ const SIMPLE_NATIVE_MODULES: SchemaType = {
            typeAnnotation: {
              type: 'FunctionTypeAnnotation',
              returnTypeAnnotation: {
-                type: 'StringTypeAnnotation',
+                name: 'StringEnum',
+                type: 'EnumDeclaration',
+                memberType: 'StringTypeAnnotation',
              },
              params: [
                {
@@ -811,7 +811,7 @@ export type CustomDeviceEvent = {
 export interface Spec extends TurboModule {
  +getCallback: () => () => void;
  +getMixed: (arg: mixed) => mixed;
-  +getEnums: (quality: Quality, resolution?: Resolution, stringOptions: StringOptions) => string;
+  +getEnums: (quality: Quality, resolution?: Resolution, stringOptions: StringOptions) => Quality;
  +getBinaryTreeNode: (arg: BinaryTreeNode) => BinaryTreeNode;
  +getGraphNode: (arg: GraphNode) => GraphNode;
  +getMap: (arg: {[a: string]: ?number}) => {[b: string]: ?number};
@@ -227,7 +227,9 @@ exports[`RN Codegen Flow Parser can generate fixture CXX_ONLY_NATIVE_MODULE 1`]
            'typeAnnotation': {
              'type': 'FunctionTypeAnnotation',
              'returnTypeAnnotation': {
-                'type': 'StringTypeAnnotation'
+                'name': 'Quality',
+                'type': 'EnumDeclaration',
+                'memberType': 'StringTypeAnnotation'
              },
              'params': [
                {
@@ -900,7 +900,7 @@ export type CustomDeviceEvent = {
 export interface Spec extends TurboModule {
  readonly getCallback: () => () => void;
  readonly getMixed: (arg: unknown) => unknown;
-  readonly getEnums: (quality: Quality, resolution?: Resolution, stringOptions: StringOptions) => string;
+  readonly getEnums: (quality: Quality, resolution?: Resolution, stringOptions: StringOptions) => Quality;
  readonly getBinaryTreeNode: (arg: BinaryTreeNode) => BinaryTreeNode;
  readonly getGraphNode: (arg: GraphNode) => GraphNode;
  readonly getMap: (arg: {[a: string]: number | null;}) => {[b: string]: number | null;};
@@ -218,7 +218,9 @@ exports[`RN Codegen TypeScript Parser can generate fixture CXX_ONLY_NATIVE_MODUL
            'typeAnnotation': {
              'type': 'FunctionTypeAnnotation',
              'returnTypeAnnotation': {
-                'type': 'StringTypeAnnotation'
+                'name': 'Quality',
+                'type': 'EnumDeclaration',
+                'memberType': 'StringTypeAnnotation'
              },
              'params': [
                {
@@ -16,5 +16,5 @@ import * as React from 'react';

 export default (createAnimatedComponent(FlatList): AnimatedComponentType<
  React.ElementConfig<typeof FlatList>,
-  React.ElementRef<typeof FlatList>,
+  FlatList<mixed>,
 >);
@@ -8,7 +8,9 @@
 #import <React/RCTBridgeDelegate.h>
 #import <React/RCTConvert.h>
 #import <UIKit/UIKit.h>
+#import "RCTArchConfiguratorProtocol.h"
 #import "RCTRootViewFactory.h"
+#import "RCTUIConfiguratorProtocol.h"

@class RCTBridge;
@protocol RCTBridgeDelegate;
@@ -55,7 +57,12 @@ NS_ASSUME_NONNULL_BEGIN
                                                         (const facebook::react::ObjCTurboModule::InitParams &)params
 *   - (id<RCTTurboModule>)getModuleInstanceFromClass:(Class)moduleClass
 */
-@interface RCTAppDelegate : UIResponder <UIApplicationDelegate, UISceneDelegate, RCTBridgeDelegate>
+@interface RCTAppDelegate : UIResponder <
+                                UIApplicationDelegate,
+                                UISceneDelegate,
+                                RCTBridgeDelegate,
+                                RCTUIConfiguratorProtocol,
+                                RCTArchConfiguratorProtocol>

 /// The window object, used to render the UViewControllers
@property (nonatomic, strong, nonnull) UIWindow *window;
@@ -96,48 +103,6 @@ NS_ASSUME_NONNULL_BEGIN
 - (UIView *)createRootViewWithBridge:(RCTBridge *)bridge
                          moduleName:(NSString *)moduleName
                           initProps:(NSDictionary *)initProps;
-/**
- * This method can be used to customize the rootView that is passed to React Native.
- * A typical example is to override this method in the AppDelegate to change the background color.
- * To achieve this, add in your `AppDelegate.mm`:
- * ```
- * - (void)customizeRootView:(RCTRootView *)rootView
- * {
- *   rootView.backgroundColor = [UIColor colorWithDynamicProvider:^UIColor *(UITraitCollection *traitCollection) {
- *     if ([traitCollection userInterfaceStyle] == UIUserInterfaceStyleDark) {
- *       return [UIColor blackColor];
- *     } else {
- *       return [UIColor whiteColor];
- *     }
- *   }];
- * }
- * ```
- *
- * @parameter: rootView - The root view to customize.
- */
- (void)customizeRootView:(RCTRootView *)rootView;
-
-/**
- * It creates the RootViewController.
- * By default, it creates a new instance of a `UIViewController`.
- * You can override it to provide your own initial ViewController.
- *
- * @return: an instance of `UIViewController`.
- */
- (UIViewController *)createRootViewController;
-
-/**
- * It assigns the rootView to the rootViewController
- * By default, it assigns the rootView to the view property of the rootViewController
- * If you are not using a simple UIViewController, then there could be other methods to use to setup the rootView.
- * For example: UISplitViewController requires `setViewController(_:for:)`
- */
- (void)setRootView:(UIView *)rootView toRootViewController:(UIViewController *)rootViewController;
-
-/**
- * The default `RCTColorSpace` for the app. It defaults to `RCTColorSpaceSRGB`.
- */
-@property (nonatomic, readonly) RCTColorSpace defaultColorSpace;

 /// This method returns a map of Component Descriptors and Components classes that needs to be registered in the
 /// new renderer. The Component Descriptor is a string which represent the name used in JS to refer to the native
@@ -147,27 +112,6 @@ NS_ASSUME_NONNULL_BEGIN
 /// @return a dictionary that associate a component for the new renderer with his descriptor.
 - (NSDictionary<NSString *, Class<RCTComponentViewProtocol>> *)thirdPartyFabricComponents;

-/// This method controls whether the `turboModules` feature of the New Architecture is turned on or off.
-///
-/// @note: This is required to be rendering on Fabric (i.e. on the New Architecture).
-/// @return: `true` if the Turbo Native Module are enabled. Otherwise, it returns `false`.
- (BOOL)turboModuleEnabled __attribute__((deprecated("Use newArchEnabled instead")));
-
-/// This method controls whether the App will use the Fabric renderer of the New Architecture or not.
-///
-/// @return: `true` if the Fabric Renderer is enabled. Otherwise, it returns `false`.
- (BOOL)fabricEnabled __attribute__((deprecated("Use newArchEnabled instead")));
-
-/// This method controls whether React Native's new initialization layer is enabled.
-///
-/// @return: `true` if the new initialization layer is enabled. Otherwise returns `false`.
- (BOOL)bridgelessEnabled __attribute__((deprecated("Use newArchEnabled instead")));
-
-/// This method controls whether React Native uses new Architecture.
-///
-/// @return: `true` if the new architecture is enabled. Otherwise returns `false`.
- (BOOL)newArchEnabled;
-
 /// Return the bundle URL for the main bundle.
 - (NSURL *__nullable)bundleURL;

@@ -34,6 +34,8 @@
 #endif
 #import <react/nativemodule/defaults/DefaultTurboModules.h>

+using namespace facebook::react;
+
@interface RCTAppDelegate () <RCTComponentViewFactoryComponentProvider, RCTHostDelegate>
@end

@@ -76,6 +78,7 @@
  self.window = [[UIWindow alloc] initWithFrame:[UIScreen mainScreen].bounds];
  UIViewController *rootViewController = [self createRootViewController];
  [self setRootView:rootView toRootViewController:rootViewController];
+  _window.windowScene.delegate = self;
  _window.rootViewController = rootViewController;
  [_window makeKeyAndVisible];
 }
@@ -178,18 +181,6 @@
 {
 }

- (void)host:(RCTHost *)host
-    didReceiveJSErrorStack:(NSArray<NSDictionary<NSString *, id> *> *)stack
-                   message:(NSString *)message
-           originalMessage:(NSString *_Nullable)originalMessage
-                      name:(NSString *_Nullable)name
-            componentStack:(NSString *_Nullable)componentStack
-               exceptionId:(NSUInteger)exceptionId
-                   isFatal:(BOOL)isFatal
-                 extraData:(NSDictionary<NSString *, id> *)extraData
-{
-}
-
 #pragma mark - Bridge and Bridge Adapter properties

 - (RCTBridge *)bridge
@@ -223,15 +214,14 @@
 #endif
 }

- (std::shared_ptr<facebook::react::TurboModule>)getTurboModule:(const std::string &)name
-                                                      jsInvoker:(std::shared_ptr<facebook::react::CallInvoker>)jsInvoker
+- (std::shared_ptr<TurboModule>)getTurboModule:(const std::string &)name
+                                     jsInvoker:(std::shared_ptr<CallInvoker>)jsInvoker
 {
-  return facebook::react::DefaultTurboModules::getTurboModule(name, jsInvoker);
+  return DefaultTurboModules::getTurboModule(name, jsInvoker);
 }

- (std::shared_ptr<facebook::react::TurboModule>)getTurboModule:(const std::string &)name
-                                                     initParams:
-                                                         (const facebook::react::ObjCTurboModule::InitParams &)params
+- (std::shared_ptr<TurboModule>)getTurboModule:(const std::string &)name
+                                    initParams:(const ObjCTurboModule::InitParams &)params
 {
  return nullptr;
 }
@@ -305,7 +295,7 @@

 #pragma mark - Feature Flags

-class RCTAppDelegateBridgelessFeatureFlags : public facebook::react::ReactNativeFeatureFlagsDefaults {
+class RCTAppDelegateBridgelessFeatureFlags : public ReactNativeFeatureFlagsDefaults {
 public:
  bool enableBridgelessArchitecture() override
  {
@@ -319,12 +309,16 @@ class RCTAppDelegateBridgelessFeatureFlags : public facebook::react::ReactNative
  {
    return true;
  }
+  bool useNativeViewConfigsInBridgelessMode() override
+  {
+    return true;
+  }
 };

 - (void)_setUpFeatureFlags
 {
  if ([self bridgelessEnabled]) {
-    facebook::react::ReactNativeFeatureFlags::override(std::make_unique<RCTAppDelegateBridgelessFeatureFlags>());
+    ReactNativeFeatureFlags::override(std::make_unique<RCTAppDelegateBridgelessFeatureFlags>());
  }
 }

@@ -53,7 +53,9 @@ RCTAppSetupDefaultRootView(RCTBridge *bridge, NSString *moduleName, NSDictionary
    id<RCTSurfaceProtocol> surface = [[RCTFabricSurface alloc] initWithBridge:bridge
                                                                   moduleName:moduleName
                                                            initialProperties:initialProperties];
-    return [[RCTSurfaceHostingProxyRootView alloc] initWithSurface:surface];
+    UIView *rootView = [[RCTSurfaceHostingProxyRootView alloc] initWithSurface:surface];
+    [surface start];
+    return rootView;
  }
  return [[RCTRootView alloc] initWithBridge:bridge moduleName:moduleName initialProperties:initialProperties];
 }
@@ -0,0 +1,32 @@
+/*
+ * Copyright (c) Meta Platforms, Inc. and 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/RCTConvert.h>
+#import <UIKit/UIKit.h>
+
+@protocol RCTArchConfiguratorProtocol
+/// This method controls whether the `turboModules` feature of the New Architecture is turned on or off.
+///
+/// @note: This is required to be rendering on Fabric (i.e. on the New Architecture).
+/// @return: `true` if the Turbo Native Module are enabled. Otherwise, it returns `false`.
+- (BOOL)turboModuleEnabled __attribute__((deprecated("Use newArchEnabled instead")));
+
+/// This method controls whether the App will use the Fabric renderer of the New Architecture or not.
+///
+/// @return: `true` if the Fabric Renderer is enabled. Otherwise, it returns `false`.
+- (BOOL)fabricEnabled __attribute__((deprecated("Use newArchEnabled instead")));
+
+/// This method controls whether React Native's new initialization layer is enabled.
+///
+/// @return: `true` if the new initialization layer is enabled. Otherwise returns `false`.
+- (BOOL)bridgelessEnabled __attribute__((deprecated("Use newArchEnabled instead")));
+
+/// This method controls whether React Native uses new Architecture.
+///
+/// @return: `true` if the new architecture is enabled. Otherwise returns `false`.
+- (BOOL)newArchEnabled;
+@end
@@ -161,12 +161,9 @@ static NSDictionary *updateInitialProps(NSDictionary *initialProps, BOOL isFabri
             initialProperties:(NSDictionary *)initialProperties
                 launchOptions:(NSDictionary *)launchOptions
 {
-  NSDictionary *initProps = updateInitialProps(initialProperties, self->_configuration.fabricEnabled);
-
-  if (self->_configuration.bridgelessEnabled) {
-    // Enable native view config interop only if both bridgeless mode and Fabric is enabled.
-    RCTSetUseNativeViewConfigsInBridgelessMode(self->_configuration.fabricEnabled);
+  NSDictionary *initProps = updateInitialProps(initialProperties, _configuration.fabricEnabled);

+  if (_configuration.bridgelessEnabled) {
    // Enable TurboModule interop by default in Bridgeless mode
    RCTEnableTurboModuleInterop(YES);
    RCTEnableTurboModuleInteropBridgeProxy(YES);
@@ -175,9 +172,8 @@ static NSDictionary *updateInitialProps(NSDictionary *initialProps, BOOL isFabri

    RCTFabricSurface *surface = [self.reactHost createSurfaceWithModuleName:moduleName initialProperties:initProps];

-    RCTSurfaceHostingProxyRootView *surfaceHostingProxyRootView = [[RCTSurfaceHostingProxyRootView alloc]
-        initWithSurface:surface
-        sizeMeasureMode:RCTSurfaceSizeMeasureModeWidthExact | RCTSurfaceSizeMeasureModeHeightExact];
+    RCTSurfaceHostingProxyRootView *surfaceHostingProxyRootView =
+        [[RCTSurfaceHostingProxyRootView alloc] initWithSurface:surface];

    surfaceHostingProxyRootView.backgroundColor = [UIColor systemBackgroundColor];
    if (self->_configuration.customizeRootView != nil) {
@@ -190,8 +186,8 @@ static NSDictionary *updateInitialProps(NSDictionary *initialProps, BOOL isFabri
  [self createBridgeAdapterIfNeeded];

  UIView *rootView;
-  if (self->_configuration.createRootViewWithBridge != nil) {
-    rootView = self->_configuration.createRootViewWithBridge(self.bridge, moduleName, initProps);
+  if (_configuration.createRootViewWithBridge != nil) {
+    rootView = _configuration.createRootViewWithBridge(self.bridge, moduleName, initProps);
  } else {
    rootView = [self createRootViewWithBridge:self.bridge moduleName:moduleName initProps:initProps];
  }
@@ -0,0 +1,56 @@
+/*
+ * Copyright (c) Meta Platforms, Inc. and 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/RCTConvert.h>
+#import <UIKit/UIKit.h>
+
+@class RCTRootView;
+
+@protocol RCTUIConfiguratorProtocol
+/**
+ * The default `RCTColorSpace` for the app. It defaults to `RCTColorSpaceSRGB`.
+ */
+- (RCTColorSpace)defaultColorSpace;
+
+/**
+ * This method can be used to customize the rootView that is passed to React Native.
+ * A typical example is to override this method in the AppDelegate to change the background color.
+ * To achieve this, add in your `AppDelegate.mm`:
+ * ```
+ * - (void)customizeRootView:(RCTRootView *)rootView
+ * {
+ *   rootView.backgroundColor = [UIColor colorWithDynamicProvider:^UIColor *(UITraitCollection *traitCollection) {
+ *     if ([traitCollection userInterfaceStyle] == UIUserInterfaceStyleDark) {
+ *       return [UIColor blackColor];
+ *     } else {
+ *       return [UIColor whiteColor];
+ *     }
+ *   }];
+ * }
+ * ```
+ *
+ * @parameter: rootView - The root view to customize.
+ */
+- (void)customizeRootView:(RCTRootView *)rootView;
+
+/**
+ * It creates the RootViewController.
+ * By default, it creates a new instance of a `UIViewController`.
+ * You can override it to provide your own initial ViewController.
+ *
+ * @return: an instance of `UIViewController`.
+ */
+- (UIViewController *)createRootViewController;
+
+/**
+ * It assigns the rootView to the rootViewController
+ * By default, it assigns the rootView to the view property of the rootViewController
+ * If you are not using a simple UIViewController, then there could be other methods to use to setup the rootView.
+ * For example: UISplitViewController requires `setViewController(_:for:)`
+ */
+- (void)setRootView:(UIView *)rootView toRootViewController:(UIViewController *)rootViewController;
+@end
@@ -64,7 +64,7 @@ Pod::Spec.new do |s|
    "CLANG_CXX_LANGUAGE_STANDARD" => rct_cxx_language_standard(),
    "DEFINES_MODULE" => "YES"
  }
-  s.user_target_xcconfig   = { "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/Headers/Private/React-Core\""}
+  s.user_target_xcconfig   = { "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/Headers/Private/React-Core\" \"$(PODS_ROOT)/Headers/Private/Yoga\""}

  s.dependency "React-Core"
  s.dependency "RCT-Folly", folly_version
@@ -141,24 +141,31 @@ let inExceptionHandler = false;
 * Logs exceptions to the (native) console and displays them
 */
 function handleException(e: mixed, isFatal: boolean) {
-  let error: Error;
-  if (e instanceof Error) {
-    error = e;
-  } else {
-    // Workaround for reporting errors caused by `throw 'some string'`
-    // Unfortunately there is no way to figure out the stacktrace in this
-    // case, so if you ended up here trying to trace an error, look for
-    // `throw '<error message>'` somewhere in your codebase.
-    error = new SyntheticError(e);
-  }
-  try {
-    inExceptionHandler = true;
-    /* $FlowFixMe[class-object-subtyping] added when improving typing for this
-     * parameters */
-    // $FlowFixMe[incompatible-call]
-    reportException(error, isFatal, /*reportToConsole*/ true);
-  } finally {
-    inExceptionHandler = false;
+  // TODO(T196834299): We should really use a c++ turbomodule for this
+  const reportToConsole = true;
+  if (
+    !global.RN$handleException ||
+    !global.RN$handleException(e, isFatal, reportToConsole)
+  ) {
+    let error: Error;
+    if (e instanceof Error) {
+      error = e;
+    } else {
+      // Workaround for reporting errors caused by `throw 'some string'`
+      // Unfortunately there is no way to figure out the stacktrace in this
+      // case, so if you ended up here trying to trace an error, look for
+      // `throw '<error message>'` somewhere in your codebase.
+      error = new SyntheticError(e);
+    }
+    try {
+      inExceptionHandler = true;
+      /* $FlowFixMe[class-object-subtyping] added when improving typing for this
+       * parameters */
+      // $FlowFixMe[incompatible-call]
+      reportException(error, isFatal, reportToConsole);
+    } finally {
+      inExceptionHandler = false;
+    }
  }
 }

@@ -170,7 +177,10 @@ function reactConsoleErrorHandler(...args) {
  if (!console.reportErrorsAsExceptions) {
    return;
  }
-  if (inExceptionHandler) {
+  if (
+    inExceptionHandler ||
+    (global.RN$inExceptionHandler && global.RN$inExceptionHandler())
+  ) {
    // The fundamental trick here is that are multiple entry point to logging errors:
    // (see D19743075 for more background)
    //
@@ -224,14 +234,21 @@ function reactConsoleErrorHandler(...args) {
    error.name = 'console.error';
  }

-  reportException(
-    /* $FlowFixMe[class-object-subtyping] added when improving typing for this
-     * parameters */
-    // $FlowFixMe[incompatible-call]
-    error,
-    false, // isFatal
-    false, // reportToConsole
-  );
+  const isFatal = false;
+  const reportToConsole = false;
+  if (
+    !global.RN$handleException ||
+    !global.RN$handleException(error, isFatal, reportToConsole)
+  ) {
+    reportException(
+      /* $FlowFixMe[class-object-subtyping] added when improving typing for this
+       * parameters */
+      // $FlowFixMe[incompatible-call]
+      error,
+      isFatal,
+      reportToConsole,
+    );
+  }
 }

 /**
@@ -14,7 +14,6 @@ import typeof NativeExceptionsManager from '../NativeExceptionsManager';
 export default ({
  reportFatalException: jest.fn(),
  reportSoftException: jest.fn(),
-  updateExceptionMessage: jest.fn(),
  dismissRedbox: jest.fn(),
  reportException: jest.fn(),
 }: NativeExceptionsManager);
@@ -67,8 +67,6 @@ function runExceptionsManagerTests() {
        return {
          default: {
            reportException: jest.fn(),
-            // Used to show symbolicated messages, not part of this test.
-            updateExceptionMessage: () => {},
          },
        };
      });
@@ -21,13 +21,7 @@ ExceptionsManager.installConsoleErrorReporter();
 if (!global.__fbDisableExceptionsManager) {
  const handleError = (e: mixed, isFatal: boolean) => {
    try {
-      // TODO(T196834299): We should really use a c++ turbomodule for this
-      if (
-        !global.RN$handleException ||
-        !global.RN$handleException(e, isFatal)
-      ) {
-        ExceptionsManager.handleException(e, isFatal);
-      }
+      ExceptionsManager.handleException(e, isFatal);
    } catch (ee) {
      console.log('Failed to print error: ', ee.message);
      throw e;
@@ -60,18 +60,28 @@ export interface ImagePropsIOS {
 interface ImagePropsAndroid {
  /**
   * 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.
+   * differ from the image view's dimensions. Defaults to `auto`.
   *
-   * 'auto': Use heuristics to pick between resize and scale.
+   * - `auto`: Use heuristics to pick between `resize` and `scale`.
   *
-   * 'resize': A software operation which changes the encoded image in memory before it gets decoded.
-   * This should be used instead of scale when the image is much larger than the view.
+   * - `resize`: A software operation which changes the encoded image in memory before it
+   * gets decoded. This should be used instead of `scale` when the image is much larger
+   * than the view.
   *
-   * 'scale': The image gets drawn downscaled or upscaled. Compared to resize, scale is faster (usually hardware accelerated)
-   * and produces higher quality images. This should be used if the image is smaller than the view.
-   * It should also be used if the image is slightly bigger than the view.
+   * - `scale`: The image gets drawn downscaled or upscaled. Compared to `resize`, `scale` is
+   * faster (usually hardware accelerated) and produces higher quality images. This
+   * should be used if the image is smaller than the view. It should also be used if the
+   * image is slightly bigger than the view.
+   *
+   * - `none`: No sampling is performed and the image is displayed in its full resolution. This
+   * should only be used in rare circumstances because it is considered unsafe as Android will
+   * throw a runtime exception when trying to render images that consume too much memory.
+   *
+   * More details about `resize` and `scale` can be found at http://frescolib.org/docs/resizing-rotating.html.
+   *
+   * @platform android
   */
-  resizeMethod?: 'auto' | 'resize' | 'scale' | undefined;
+  resizeMethod?: 'auto' | 'resize' | 'scale' | 'none' | undefined;

  /**
   * Duration of fade in animation in ms. Defaults to 300
@@ -193,27 +203,6 @@ export interface ImagePropsBase
   */
  resizeMode?: ImageResizeMode | undefined;

-  /**
-   * 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`.
-   *
-   * - `auto`: Use heuristics to pick between `resize` and `scale`.
-   *
-   * - `resize`: A software operation which changes the encoded image in memory before it
-   * gets decoded. This should be used instead of `scale` when the image is much larger
-   * than the view.
-   *
-   * - `scale`: The image gets drawn downscaled or upscaled. Compared to `resize`, `scale` is
-   * faster (usually hardware accelerated) and produces higher quality images. This
-   * should be used if the image is smaller than the view. It should also be used if the
-   * image is slightly bigger than the view.
-   *
-   * More details about `resize` and `scale` can be found at http://frescolib.org/docs/resizing-rotating.html.
-   *
-   * @platform android
-   */
-  resizeMethod?: 'auto' | 'resize' | 'scale' | undefined;
-
  /**
   * The image source (either a remote URL or a local file resource).
   *
@@ -51,7 +51,7 @@ export interface ImageURISource {
   * to a URL load request, no attempt is made to load the data from the originating source,
   * and the load is considered to have failed.
   *
-   * @platform ios
+   * @platform ios (for `force-cache`)
   */
  cache?: 'default' | 'reload' | 'force-cache' | 'only-if-cached' | undefined;
  /**
@@ -66,7 +66,7 @@ export interface ImageURISource {
   * to a URL load request, no attempt is made to load the data from the originating source,
   * and the load is considered to have failed.
   *
-   * @platform ios
+   * @platform ios (for `force-cache`)
   */
  +cache?: ?('default' | 'reload' | 'force-cache' | 'only-if-cached');

@@ -480,10 +480,10 @@ class FlatList<ItemT> extends React.PureComponent<Props<ItemT>, void> {
    this._checkProps(this.props);
  }

-  _listRef: ?React.ElementRef<typeof VirtualizedList>;
+  _listRef: ?VirtualizedList;
  _virtualizedListPairs: Array<ViewabilityConfigCallbackPair> = [];

-  _captureRef = (ref: ?React.ElementRef<typeof VirtualizedList>) => {
+  _captureRef = (ref: ?VirtualizedList) => {
    this._listRef = ref;
  };

@@ -37,6 +37,8 @@ const COLORS = {
  'ansi-bright-white': 'rgb(247, 247, 247)',
 };

+const LRM = '\u200E'; // Left-to-Right Mark
+
 export default function Ansi({
  text,
  style,
@@ -80,25 +82,28 @@ export default function Ansi({
  };

  return (
-    <View>
+    <View style={styles.container}>
      {parsedLines.map((items, i) => (
        <View style={styles.line} key={i}>
-          {items.map((bundle, key) => {
-            const textStyle =
-              bundle.fg && COLORS[bundle.fg]
-                ? {
-                    backgroundColor: bundle.bg && COLORS[bundle.bg],
-                    color: bundle.fg && COLORS[bundle.fg],
-                  }
-                : {
-                    backgroundColor: bundle.bg && COLORS[bundle.bg],
-                  };
-            return (
-              <Text style={[style, textStyle]} key={key}>
-                {getText(bundle.content, key)}
-              </Text>
-            );
-          })}
+          <Text>
+            {LRM}
+            {items.map((bundle, key) => {
+              const textStyle =
+                bundle.fg && COLORS[bundle.fg]
+                  ? {
+                      backgroundColor: bundle.bg && COLORS[bundle.bg],
+                      color: bundle.fg && COLORS[bundle.fg],
+                    }
+                  : {
+                      backgroundColor: bundle.bg && COLORS[bundle.bg],
+                    };
+              return (
+                <Text style={[style, textStyle]} key={key}>
+                  {getText(bundle.content, key)}
+                </Text>
+              );
+            })}
+          </Text>
        </View>
      ))}
    </View>
@@ -106,6 +111,10 @@ export default function Ansi({
 }

 const styles = StyleSheet.create({
+  container: {
+    minWidth: '100%',
+    direction: 'ltr',
+  },
  line: {
    flexDirection: 'row',
  },
@@ -59,7 +59,9 @@ function LogBoxInspectorCodeFrame(props: Props): React.Node {
    <LogBoxInspectorSection heading="Source" action={<AppInfo />}>
      <View style={styles.box}>
        <View style={styles.frame}>
-          <ScrollView horizontal>
+          <ScrollView
+            horizontal
+            contentContainerStyle={styles.contentContainer}>
            <AnsiHighlight style={styles.content} text={codeFrame.content} />
          </ScrollView>
        </View>
@@ -138,6 +140,9 @@ const styles = StyleSheet.create({
    paddingTop: 10,
    paddingBottom: 10,
  },
+  contentContainer: {
+    minWidth: '100%',
+  },
  content: {
    color: LogBoxStyle.getTextColor(1),
    fontSize: 12,
@@ -26,6 +26,11 @@ exports[`LogBoxInspectorCodeFrame should render a code frame 1`] = `
      }
    >
      <ScrollView
+        contentContainerStyle={
+          Object {
+            "minWidth": "100%",
+          }
+        }
        horizontal={true}
      >
        <Ansi
@@ -108,6 +113,11 @@ exports[`LogBoxInspectorCodeFrame should render a code frame without a location
      }
    >
      <ScrollView
+        contentContainerStyle={
+          Object {
+            "minWidth": "100%",
+          }
+        }
        horizontal={true}
      >
        <Ansi
@@ -9,8 +9,7 @@

 #import <React/RCTDynamicTypeRamp.h>
 #import <React/RCTTextDecorationLineType.h>
-
-#import "RCTTextTransform.h"
+#import <React/RCTTextTransform.h>

 NS_ASSUME_NONNULL_BEGIN

@@ -278,19 +278,15 @@ NSString *const RCTTextAttributesTagAttributeName = @"RCTTextAttributesTagAttrib

 static NSString *capitalizeText(NSString *text)
 {
-  NSArray *words = [text componentsSeparatedByString:@" "];
-  NSMutableArray *newWords = [NSMutableArray new];
-  NSNumberFormatter *num = [NSNumberFormatter new];
-  for (NSString *item in words) {
-    NSString *word;
-    if ([item length] > 0 && [num numberFromString:[item substringWithRange:NSMakeRange(0, 1)]] == nil) {
-      word = [item capitalizedString];
-    } else {
-      word = [item lowercaseString];
-    }
-    [newWords addObject:word];
-  }
-  return [newWords componentsJoinedByString:@" "];
+  NSMutableString *result = [[NSMutableString alloc] initWithString:text];
+  [result
+      enumerateSubstringsInRange:NSMakeRange(0, text.length)
+                         options:NSStringEnumerationByWords
+                      usingBlock:^(NSString *substring, NSRange substringRange, NSRange enclosingRange, BOOL *stop) {
+                        [result replaceCharactersInRange:NSMakeRange(substringRange.location, 1)
+                                              withString:[[substring substringToIndex:1] uppercaseString]];
+                      }];
+  return result;
 }

 - (NSString *)applyTextAttributesToText:(NSString *)text
@@ -36,6 +36,7 @@ static NSSet<NSNumber *> *returnKeyTypesSet;
 {
  if (![self isDescendantOfView:scrollView]) {
    // View is outside scroll view
+    scrollView.firstResponderViewOutsideScrollView = self.backedTextInputView;
    return;
  }

@@ -683,7 +683,7 @@ exports[`public API should not change unintentionally Libraries/Animated/bezier.
 exports[`public API should not change unintentionally Libraries/Animated/components/AnimatedFlatList.js 1`] = `
 "declare export default AnimatedComponentType<
  React.ElementConfig<typeof FlatList>,
-  React.ElementRef<typeof FlatList>,
+  FlatList<mixed>,
 >;
 "
 `;
@@ -5725,7 +5725,7 @@ declare class FlatList<ItemT> extends React.PureComponent<Props<ItemT>, void> {
  setNativeProps(props: { [string]: mixed, ... }): void;
  constructor(props: Props<ItemT>): void;
  componentDidUpdate(prevProps: Props<ItemT>): void;
-  _listRef: ?React.ElementRef<typeof VirtualizedList>;
+  _listRef: ?VirtualizedList;
  _virtualizedListPairs: Array<ViewabilityConfigCallbackPair>;
  _captureRef: $FlowFixMe;
  _checkProps(props: Props<ItemT>): void;
@@ -18,6 +18,9 @@ NS_ASSUME_NONNULL_BEGIN

@interface RCTBridgeProxy : NSProxy

+- (instancetype)init NS_UNAVAILABLE;
+ (instancetype)new NS_UNAVAILABLE;
+
 - (instancetype)initWithViewRegistry:(RCTViewRegistry *)viewRegistry
                      moduleRegistry:(RCTModuleRegistry *)moduleRegistry
                       bundleManager:(RCTBundleManager *)bundleManager
@@ -41,6 +41,8 @@ using namespace facebook;
  void *_runtime;
 }

+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wobjc-designated-initializers"
 - (instancetype)initWithViewRegistry:(RCTViewRegistry *)viewRegistry
                      moduleRegistry:(RCTModuleRegistry *)moduleRegistry
                       bundleManager:(RCTBundleManager *)bundleManager
@@ -61,8 +63,10 @@ using namespace facebook;
    _runtime = runtime;
    _launchOptions = [launchOptions copy];
  }
+
  return self;
 }
+#pragma clang diagnostic pop

 - (void)dispatchBlock:(dispatch_block_t)block queue:(dispatch_queue_t)queue
 {
@@ -414,6 +418,10 @@ using namespace facebook;
  RCTViewRegistry *_viewRegistry;
  NSMutableDictionary<NSNumber *, UIView *> *_legacyViewRegistry;
 }
+
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wobjc-designated-initializers"
+
 - (instancetype)initWithViewRegistry:(RCTViewRegistry *)viewRegistry
 {
  self = [super self];
@@ -424,6 +432,8 @@ using namespace facebook;
  return self;
 }

+#pragma clang diagnostic pop
+
 /**
 * RCTViewRegistry
 */
@@ -11,6 +11,11 @@
  std::shared_ptr<facebook::react::CallInvoker> _callInvoker;
 }

+- (instancetype)init
+{
+  return [self initWithCallInvoker:nullptr];
+}
+
 - (instancetype)initWithCallInvoker:(std::shared_ptr<facebook::react::CallInvoker>)callInvoker
 {
  if (self = [super init]) {
@@ -50,15 +50,3 @@ RCT_EXTERN NSString *const RCTDidInitializeModuleNotification;
 */
 RCT_EXTERN BOOL RCTGetDispatchW3CPointerEvents(void);
 RCT_EXTERN void RCTSetDispatchW3CPointerEvents(BOOL value);
-
-/*
- * Memory Pressure Unloading Level
- */
-RCT_EXTERN int RCTGetMemoryPressureUnloadLevel(void);
-RCT_EXTERN void RCTSetMemoryPressureUnloadLevel(int value);
-
-/*
- * Use native view configs in bridgeless mode
- */
-RCT_EXTERN BOOL RCTGetUseNativeViewConfigsInBridgelessMode(void);
-RCT_EXTERN void RCTSetUseNativeViewConfigsInBridgelessMode(BOOL value);
@@ -38,34 +38,3 @@ void RCTSetDispatchW3CPointerEvents(BOOL value)
 {
  RCTDispatchW3CPointerEvents = value;
 }
-
-/*
- * Memory Pressure Unloading Level for experimentation only.
- * Default is 15, which is TRIM_MEMORY_RUNNING_CRITICAL.
- */
-static int RCTMemoryPressureUnloadLevel = 15;
-
-int RCTGetMemoryPressureUnloadLevel(void)
-{
-  return RCTMemoryPressureUnloadLevel;
-}
-
-void RCTSetMemoryPressureUnloadLevel(int value)
-{
-  RCTMemoryPressureUnloadLevel = value;
-}
-
-/*
- * Use native view configs in bridgeless mode
- */
-static BOOL RCTUseNativeViewConfigsInBridgelessMode = NO;
-
-BOOL RCTGetUseNativeViewConfigsInBridgelessMode(void)
-{
-  return RCTUseNativeViewConfigsInBridgelessMode;
-}
-
-void RCTSetUseNativeViewConfigsInBridgelessMode(BOOL value)
-{
-  RCTUseNativeViewConfigsInBridgelessMode = value;
-}
@@ -34,7 +34,7 @@ typedef id<RCTBridgeModule> (^RCTBridgeModuleProvider)(void);
                     moduleRegistry:(RCTModuleRegistry *)moduleRegistry
            viewRegistry_DEPRECATED:(RCTViewRegistry *)viewRegistry_DEPRECATED
                      bundleManager:(RCTBundleManager *)bundleManager
-                  callableJSModules:(RCTCallableJSModules *)callableJSModules;
+                  callableJSModules:(RCTCallableJSModules *)callableJSModules NS_DESIGNATED_INITIALIZER;

 - (instancetype)initWithModuleInstance:(id<RCTBridgeModule>)instance
                                bridge:(RCTBridge *)bridge
@@ -53,8 +53,21 @@ int32_t getUniqueId()
@synthesize instance = _instance;
@synthesize methodQueue = _methodQueue;

- (void)setUp
+- (void)_setUpWithBridge:(RCTBridge *)bridge
+             moduleRegistry:(RCTModuleRegistry *)moduleRegistry
+    viewRegistry_DEPRECATED:(RCTViewRegistry *)viewRegistry_DEPRECATED
+              bundleManager:(RCTBundleManager *)bundleManager
+          callableJSModules:(RCTCallableJSModules *)callableJSModules
 {
+  // start with the ivars
+  {
+    _bridge = bridge;
+    _moduleRegistry = moduleRegistry;
+    _viewRegistry_DEPRECATED = viewRegistry_DEPRECATED;
+    _bundleManager = bundleManager;
+    _callableJSModules = callableJSModules;
+  }
+
  _implementsBatchDidComplete = [_moduleClass instancesRespondToSelector:@selector(batchDidComplete)];

  // If a module overrides `constantsToExport` and doesn't implement `requiresMainQueueSetup`, then we must assume
@@ -86,35 +99,17 @@ int32_t getUniqueId()
            viewRegistry_DEPRECATED:(RCTViewRegistry *)viewRegistry_DEPRECATED
                      bundleManager:(RCTBundleManager *)bundleManager
                  callableJSModules:(RCTCallableJSModules *)callableJSModules
-{
-  return [self _initWithModuleClass:moduleClass
-                     moduleProvider:^id<RCTBridgeModule> {
-                       return [moduleClass new];
-                     }
-                             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];
+    _moduleProvider = [^id<RCTBridgeModule> {
+      return [moduleClass new];
+    } copy];
+    [self _setUpWithBridge:bridge
+                 moduleRegistry:moduleRegistry
+        viewRegistry_DEPRECATED:viewRegistry_DEPRECATED
+                  bundleManager:bundleManager
+              callableJSModules:callableJSModules];
  }
  return self;
 }
@@ -127,14 +122,13 @@ int32_t getUniqueId()
                     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];
+    [self _setUpWithBridge:bridge
+                 moduleRegistry:moduleRegistry
+        viewRegistry_DEPRECATED:viewRegistry_DEPRECATED
+                  bundleManager:bundleManager
+              callableJSModules:callableJSModules];
  }
  return self;
 }
@@ -39,6 +39,13 @@ NS_ASSUME_NONNULL_BEGIN
@property (nonatomic, assign) NSTimeInterval loadingViewFadeDuration;
@property (nonatomic, assign) CGSize minimumSize;

+- (instancetype)init NS_UNAVAILABLE;
+ (instancetype)new NS_UNAVAILABLE;
+- (instancetype)initWithFrame:(CGRect)frame NS_UNAVAILABLE;
+- (instancetype)initWithCoder:(NSCoder *)aDecoder NS_UNAVAILABLE;
+- (instancetype)initWithSurface:(id<RCTSurfaceProtocol>)surface
+                sizeMeasureMode:(RCTSurfaceSizeMeasureMode)sizeMeasureMode NS_UNAVAILABLE;
+
 - (instancetype)initWithSurface:(id<RCTSurfaceProtocol>)surface NS_DESIGNATED_INITIALIZER;

 - (void)cancelTouches;
@@ -53,11 +53,8 @@ static RCTRootViewSizeFlexibility convertToRootViewSizeFlexibility(RCTSurfaceSiz

 - (instancetype)initWithSurface:(id<RCTSurfaceProtocol>)surface
 {
-  if (self = [super initWithSurface:surface
-                    sizeMeasureMode:RCTSurfaceSizeMeasureModeWidthExact | RCTSurfaceSizeMeasureModeHeightExact]) {
-    [surface start];
-  }
-  return self;
+  return [super initWithSurface:surface
+                sizeMeasureMode:RCTSurfaceSizeMeasureModeWidthExact | RCTSurfaceSizeMeasureModeHeightExact];
 }

 RCT_NOT_IMPLEMENTED(-(instancetype)initWithFrame : (CGRect)frame)
@@ -128,7 +128,10 @@ static BOOL RCTIsIPhoneNotched()
    RCTAssertMainQueue();

    // 20pt is the top safeArea value in non-notched devices
-    isIPhoneNotched = RCTSharedApplication().keyWindow.safeAreaInsets.top > 20;
+    UIWindow *keyWindow = RCTKeyWindow();
+    if (keyWindow) {
+      isIPhoneNotched = keyWindow.safeAreaInsets.top > 20;
+    }
  });
 #endif

@@ -11,7 +11,6 @@
 NS_ASSUME_NONNULL_BEGIN

@protocol RCTExceptionsManagerDelegate <NSObject>
-
 - (void)handleSoftJSExceptionWithMessage:(nullable NSString *)message
                                   stack:(nullable NSArray *)stack
                             exceptionId:(NSNumber *)exceptionId
@@ -20,12 +19,6 @@ NS_ASSUME_NONNULL_BEGIN
                                    stack:(nullable NSArray *)stack
                              exceptionId:(NSNumber *)exceptionId
                          extraDataAsJSON:(nullable NSString *)extraDataAsJSON;
-
-@optional
- (void)updateJSExceptionWithMessage:(nullable NSString *)message
-                               stack:(nullable NSArray *)stack
-                         exceptionId:(NSNumber *)exceptionId;
-
@end

@interface RCTExceptionsManager : NSObject <RCTBridgeModule>
@@ -41,7 +34,7 @@ NS_ASSUME_NONNULL_BEGIN
 - (void)reportJsException:(nullable NSString *)message
                    stack:(nullable NSArray<NSDictionary *> *)stack
              exceptionId:(double)exceptionId
-                  isFatal:(bool)isFatal;
+                  isFatal:(bool)isFatal __attribute__((deprecated));

@property (nonatomic, weak) id<RCTExceptionsManagerDelegate> delegate;

@@ -99,27 +99,6 @@ RCT_EXPORT_METHOD(reportFatalException
  [self reportFatal:message stack:stack exceptionId:exceptionId extraDataAsJSON:nil];
 }

-RCT_EXPORT_METHOD(updateExceptionMessage
-                  : (NSString *)message stack
-                  : (NSArray<NSDictionary *> *)stack exceptionId
-                  : (double)exceptionId)
-{
-  if (RCTRedBoxGetEnabled()) {
-    RCTRedBox *redbox = [_moduleRegistry moduleForName:"RedBox"];
-    [redbox updateErrorMessage:message withStack:stack errorCookie:(int)exceptionId];
-  }
-
-  if (_delegate && [_delegate respondsToSelector:@selector(updateJSExceptionWithMessage:stack:exceptionId:)]) {
-    [_delegate updateJSExceptionWithMessage:message stack:stack exceptionId:[NSNumber numberWithDouble:exceptionId]];
-  }
-}
-
-// Deprecated.  Use reportFatalException directly instead.
-RCT_EXPORT_METHOD(reportUnhandledException : (NSString *)message stack : (NSArray<NSDictionary *> *)stack)
-{
-  [self reportFatalException:message stack:stack exceptionId:-1];
-}
-
 RCT_EXPORT_METHOD(dismissRedbox) {}

 RCT_EXPORT_METHOD(reportException : (JS::NativeExceptionsManager::ExceptionData &)data)
@@ -371,7 +371,8 @@ struct RCTInstanceCallback : public InstanceCallback {
  // in case if some other tread resets it.
  auto reactInstance = _reactInstance;
  if (reactInstance) {
-    int unloadLevel = RCTGetMemoryPressureUnloadLevel();
+    // Memory Pressure Unloading Level 15 represents TRIM_MEMORY_RUNNING_CRITICAL.
+    int unloadLevel = 15;
    reactInstance->handleMemoryPressure(unloadLevel);
  }
 }
@@ -14,8 +14,8 @@ namespace facebook::react {
 AppleEventBeat::AppleEventBeat(
    std::shared_ptr<OwnerBox> ownerBox,
    std::unique_ptr<const RunLoopObserver> uiRunLoopObserver,
-    RuntimeExecutor runtimeExecutor)
-    : EventBeat(std::move(ownerBox), std::move(runtimeExecutor)),
+    RuntimeScheduler& runtimeScheduler)
+    : EventBeat(std::move(ownerBox), runtimeScheduler),
      uiRunLoopObserver_(std::move(uiRunLoopObserver)) {
  uiRunLoopObserver_->setDelegate(this);
  uiRunLoopObserver_->enable();
@@ -13,6 +13,8 @@

 namespace facebook::react {

+class RuntimeScheduler;
+
 /*
 * Event beat associated with JavaScript runtime.
 * The beat is called on `RuntimeExecutor`'s thread induced by the UI thread
@@ -23,7 +25,7 @@ class AppleEventBeat : public EventBeat, public RunLoopObserver::Delegate {
  AppleEventBeat(
      std::shared_ptr<OwnerBox> ownerBox,
      std::unique_ptr<const RunLoopObserver> uiRunLoopObserver,
-      RuntimeExecutor runtimeExecutor);
+      RuntimeScheduler& RuntimeScheduler);

 #pragma mark - RunLoopObserver::Delegate

@@ -16,7 +16,6 @@
 #import <react/renderer/components/image/ImageProps.h>
 #import <react/renderer/imagemanager/ImageRequest.h>
 #import <react/renderer/imagemanager/RCTImagePrimitivesConversions.h>
-#import <react/utils/CoreFeatures.h>

 using namespace facebook::react;

@@ -101,13 +100,6 @@ using namespace facebook::react;
    const auto &imageRequest = _state->getData().getImageRequest();
    auto &observerCoordinator = imageRequest.getObserverCoordinator();
    observerCoordinator.removeObserver(_imageResponseObserverProxy);
-    // Cancelling image request because we are no longer observing it.
-    // This is not 100% correct place to do this because we may want to
-    // re-create RCTImageComponentView with the same image and if it
-    // was cancelled before downloaded, download is not resumed.
-    // This will only become issue if we decouple life cycle of a
-    // ShadowNode from ComponentView, which is not something we do now.
-    imageRequest.cancel();
  }

  _state = state;
@@ -38,6 +38,9 @@ NS_ASSUME_NONNULL_BEGIN
 /** Focus area of newly-activated text input relative to the window to compare against UIKeyboardFrameBegin/End */
@property (nonatomic, assign) CGRect firstResponderFocus;

+/** newly-activated text input outside of the scroll view */
+@property (nonatomic, weak) UIView *firstResponderViewOutsideScrollView;
+
 /*
 * Returns the subview of the scroll view that the component uses to mount all subcomponents into. That's useful to
 * separate component views from auxiliary views to be able to reliably implement pull-to-refresh- and RTL-related
@@ -182,6 +182,7 @@ RCTSendScrollEventForNativeAnimations_DEPRECATED(UIScrollView *scrollView, NSInt
  UIViewAnimationCurve curve =
      (UIViewAnimationCurve)[notification.userInfo[UIKeyboardAnimationCurveUserInfoKey] unsignedIntegerValue];
  CGRect keyboardEndFrame = [notification.userInfo[UIKeyboardFrameEndUserInfoKey] CGRectValue];
+  CGRect keyboardBeginFrame = [notification.userInfo[UIKeyboardFrameBeginUserInfoKey] CGRectValue];

  CGPoint absoluteViewOrigin = [self convertPoint:self.bounds.origin toView:nil];
  CGFloat scrollViewLowerY = isInverted ? absoluteViewOrigin.y : absoluteViewOrigin.y + self.bounds.size.height;
@@ -203,21 +204,24 @@ RCTSendScrollEventForNativeAnimations_DEPRECATED(UIScrollView *scrollView, NSInt
                                               from:self
                                           forEvent:nil]) {
    if (CGRectEqualToRect(_firstResponderFocus, CGRectNull)) {
-      // Text input view is outside of the scroll view.
-      return;
-    }
+      UIView *inputAccessoryView = _firstResponderViewOutsideScrollView.inputAccessoryView;
+      if (inputAccessoryView) {
+        // Text input view is within the inputAccessoryView.
+        contentDiff = keyboardEndFrame.origin.y - keyboardBeginFrame.origin.y;
+      }
+    } else {
+      CGRect viewIntersection = CGRectIntersection(self.firstResponderFocus, keyboardEndFrame);

-    CGRect viewIntersection = CGRectIntersection(self.firstResponderFocus, keyboardEndFrame);
+      if (CGRectIsNull(viewIntersection)) {
+        return;
+      }

-    if (CGRectIsNull(viewIntersection)) {
-      return;
-    }
-
-    // Inner text field focused
-    CGFloat focusEnd = CGRectGetMaxY(self.firstResponderFocus);
-    if (focusEnd > keyboardEndFrame.origin.y) {
-      // Text field active region is below visible area with keyboard - update diff to bring into view
-      contentDiff = keyboardEndFrame.origin.y - focusEnd;
+      // Inner text field focused
+      CGFloat focusEnd = CGRectGetMaxY(self.firstResponderFocus);
+      if (focusEnd > keyboardEndFrame.origin.y) {
+        // Text field active region is below visible area with keyboard - update diff to bring into view
+        contentDiff = keyboardEndFrame.origin.y - focusEnd;
+      }
    }
  }

@@ -78,7 +78,7 @@ static NSSet<NSNumber *> *returnKeyTypesSet;
    const auto &defaultProps = TextInputShadowNode::defaultSharedProps();
    _props = defaultProps;

-    _backedTextInputView = defaultProps->traits.multiline ? [RCTUITextView new] : [RCTUITextField new];
+    _backedTextInputView = defaultProps->multiline ? [RCTUITextView new] : [RCTUITextField new];
    _backedTextInputView.textInputDelegate = self;
    _ignoreNextTextInputCall = NO;
    _comingFromJS = NO;
@@ -126,6 +126,7 @@ static NSSet<NSNumber *> *returnKeyTypesSet;
 {
  if (![self isDescendantOfView:scrollView.scrollView] || !_backedTextInputView.isFirstResponder) {
    // View is outside scroll view or it's not a first responder.
+    scrollView.firstResponderViewOutsideScrollView = _backedTextInputView;
    return;
  }

@@ -166,8 +167,8 @@ static NSSet<NSNumber *> *returnKeyTypesSet;
  const auto &newTextInputProps = static_cast<const TextInputProps &>(*props);

  // Traits:
-  if (newTextInputProps.traits.multiline != oldTextInputProps.traits.multiline) {
-    [self _setMultiline:newTextInputProps.traits.multiline];
+  if (newTextInputProps.multiline != oldTextInputProps.multiline) {
+    [self _setMultiline:newTextInputProps.multiline];
  }

  if (newTextInputProps.traits.autocapitalizationType != oldTextInputProps.traits.autocapitalizationType) {
@@ -448,7 +449,7 @@ static NSSet<NSNumber *> *returnKeyTypesSet;
    return;
  }
  const auto &props = static_cast<const TextInputProps &>(*_props);
-  if (props.traits.multiline && ![_lastStringStateWasUpdatedWith isEqual:_backedTextInputView.attributedText]) {
+  if (props.multiline && ![_lastStringStateWasUpdatedWith isEqual:_backedTextInputView.attributedText]) {
    [self textInputDidChange];
    _ignoreNextTextInputCall = YES;
  }
@@ -785,14 +786,7 @@ static NSSet<NSNumber *> *returnKeyTypesSet;
 - (SubmitBehavior)getSubmitBehavior
 {
  const auto &props = static_cast<const TextInputProps &>(*_props);
-  const SubmitBehavior submitBehaviorDefaultable = props.traits.submitBehavior;
-
-  // We should always have a non-default `submitBehavior`, but in case we don't, set it based on multiline.
-  if (submitBehaviorDefaultable == SubmitBehavior::Default) {
-    return props.traits.multiline ? SubmitBehavior::Newline : SubmitBehavior::BlurAndSubmit;
-  }
-
-  return submitBehaviorDefaultable;
+  return props.getNonDefaultSubmitBehavior();
 }

@end
@@ -48,7 +48,7 @@ NS_ASSUME_NONNULL_BEGIN
 * Schedule a mounting transaction to be performed on the main thread.
 * Can be called from any thread.
 */
- (void)scheduleTransaction:(facebook::react::MountingCoordinator::Shared)mountingCoordinator;
+- (void)scheduleTransaction:(std::shared_ptr<const facebook::react::MountingCoordinator>)mountingCoordinator;

 /**
 * Dispatch a command to be performed on the main thread.
@@ -20,7 +20,6 @@
 #import <react/renderer/core/LayoutableShadowNode.h>
 #import <react/renderer/core/RawProps.h>
 #import <react/renderer/mounting/TelemetryController.h>
-#import <react/utils/CoreFeatures.h>

 #import <React/RCTComponentViewProtocol.h>
 #import <React/RCTComponentViewRegistry.h>
@@ -187,7 +186,7 @@ static void RCTPerformMountInstructions(
                                          componentViewDescriptor:rootViewDescriptor];
 }

- (void)scheduleTransaction:(MountingCoordinator::Shared)mountingCoordinator
+- (void)scheduleTransaction:(std::shared_ptr<const MountingCoordinator>)mountingCoordinator
 {
  if (RCTIsMainQueue()) {
    // Already on the proper thread, so:
@@ -26,9 +26,10 @@ NS_ASSUME_NONNULL_BEGIN
 */
@protocol RCTSchedulerDelegate

- (void)schedulerDidFinishTransaction:(facebook::react::MountingCoordinator::Shared)mountingCoordinator;
+- (void)schedulerDidFinishTransaction:(std::shared_ptr<const facebook::react::MountingCoordinator>)mountingCoordinator;

- (void)schedulerShouldRenderTransactions:(facebook::react::MountingCoordinator::Shared)mountingCoordinator;
+- (void)schedulerShouldRenderTransactions:
+    (std::shared_ptr<const facebook::react::MountingCoordinator>)mountingCoordinator;

 - (void)schedulerDidDispatchCommand:(const facebook::react::ShadowView &)shadowView
                        commandName:(const std::string &)commandName
@@ -26,13 +26,13 @@ class SchedulerDelegateProxy : public SchedulerDelegate {
 public:
  SchedulerDelegateProxy(void *scheduler) : scheduler_(scheduler) {}

-  void schedulerDidFinishTransaction(const MountingCoordinator::Shared &mountingCoordinator) override
+  void schedulerDidFinishTransaction(const std::shared_ptr<const MountingCoordinator> &mountingCoordinator) override
  {
    RCTScheduler *scheduler = (__bridge RCTScheduler *)scheduler_;
    [scheduler.delegate schedulerDidFinishTransaction:mountingCoordinator];
  }

-  void schedulerShouldRenderTransactions(const MountingCoordinator::Shared &mountingCoordinator) override
+  void schedulerShouldRenderTransactions(const std::shared_ptr<const MountingCoordinator> &mountingCoordinator) override
  {
    RCTScheduler *scheduler = (__bridge RCTScheduler *)scheduler_;
    [scheduler.delegate schedulerShouldRenderTransactions:mountingCoordinator];
@@ -114,9 +114,6 @@ class LayoutAnimationDelegateProxy : public LayoutAnimationStatusDelegate, publi
 - (instancetype)initWithToolbox:(SchedulerToolbox)toolbox
 {
  if (self = [super init]) {
-    auto reactNativeConfig =
-        toolbox.contextContainer->at<std::shared_ptr<const ReactNativeConfig>>("ReactNativeConfig");
-
    _delegateProxy = std::make_unique<SchedulerDelegateProxy>((__bridge void *)self);

    if (ReactNativeFeatureFlags::enableLayoutAnimationsOnIOS()) {
@@ -620,22 +620,22 @@ RCT_NOT_IMPLEMENTED(-(instancetype)initWithTarget : (id)target action : (SEL)act
    if (eventEmitter != nil) {
      switch (eventType) {
        case RCTPointerEventTypeStart: {
-          eventEmitter->onPointerDown(pointerEvent);
+          eventEmitter->onPointerDown(std::move(pointerEvent));
          break;
        }
        case RCTPointerEventTypeMove: {
-          eventEmitter->onPointerMove(pointerEvent);
+          eventEmitter->onPointerMove(std::move(pointerEvent));
          break;
        }
        case RCTPointerEventTypeEnd: {
          eventEmitter->onPointerUp(pointerEvent);
          if (pointerEvent.isPrimary && pointerEvent.button == 0 && IsPointerWithinInitialTree(activePointer)) {
-            eventEmitter->onClick(pointerEvent);
+            eventEmitter->onClick(std::move(pointerEvent));
          }
          break;
        }
        case RCTPointerEventTypeCancel: {
-          eventEmitter->onPointerCancel(pointerEvent);
+          eventEmitter->onPointerCancel(std::move(pointerEvent));
          break;
        }
      }
@@ -761,9 +761,11 @@ RCT_NOT_IMPLEMENTED(-(instancetype)initWithTarget : (id)target action : (SEL)act
  if (eventEmitter != nil) {
    switch (recognizer.state) {
      case UIGestureRecognizerStateEnded:
-        eventEmitter->onPointerLeave(event);
+        eventEmitter->onPointerLeave(std::move(event));
+        break;
      default:
-        eventEmitter->onPointerMove(event);
+        eventEmitter->onPointerMove(std::move(event));
+        break;
    }
  }
 }
@@ -26,14 +26,12 @@
 #import <React/RCTSurfaceView.h>
 #import <React/RCTUtils.h>

-#import <react/config/ReactNativeConfig.h>
 #import <react/featureflags/ReactNativeFeatureFlags.h>
 #import <react/renderer/componentregistry/ComponentDescriptorFactory.h>
 #import <react/renderer/components/text/BaseTextProps.h>
 #import <react/renderer/runtimescheduler/RuntimeScheduler.h>
 #import <react/renderer/scheduler/SchedulerToolbox.h>
 #import <react/utils/ContextContainer.h>
-#import <react/utils/CoreFeatures.h>
 #import <react/utils/ManagedObjectWrapper.h>
 #import "AppleEventBeat.h"

@@ -227,12 +225,6 @@ using namespace facebook::react;

 - (RCTScheduler *)_createScheduler
 {
-  auto reactNativeConfig = _contextContainer->at<std::shared_ptr<const ReactNativeConfig>>("ReactNativeConfig");
-
-  if (reactNativeConfig && reactNativeConfig->getBool("react_fabric:enable_cpp_props_iterator_setter_ios")) {
-    CoreFeatures::enablePropIteratorSetter = true;
-  }
-
  auto componentRegistryFactory =
      [factory = wrapManagedObject(_mountingManager.componentViewRegistry.componentViewFactory)](
          const EventDispatcher::Weak &eventDispatcher, const ContextContainer::Shared &contextContainer) {
@@ -258,10 +250,10 @@ using namespace facebook::react;
  toolbox.bridgelessBindingsExecutor = _bridgelessBindingsExecutor;

  toolbox.eventBeatFactory =
-      [runtimeExecutor](std::shared_ptr<EventBeat::OwnerBox> ownerBox) -> std::unique_ptr<EventBeat> {
+      [runtimeScheduler](std::shared_ptr<EventBeat::OwnerBox> ownerBox) -> std::unique_ptr<EventBeat> {
    auto runLoopObserver =
        std::make_unique<const MainRunLoopObserver>(RunLoopObserver::Activity::BeforeWaiting, ownerBox->owner);
-    return std::make_unique<AppleEventBeat>(std::move(ownerBox), std::move(runLoopObserver), runtimeExecutor);
+    return std::make_unique<AppleEventBeat>(std::move(ownerBox), std::move(runLoopObserver), *runtimeScheduler);
  };

  RCTScheduler *scheduler = [[RCTScheduler alloc] initWithToolbox:toolbox];
@@ -297,12 +289,12 @@ using namespace facebook::react;

 #pragma mark - RCTSchedulerDelegate

- (void)schedulerDidFinishTransaction:(MountingCoordinator::Shared)mountingCoordinator
+- (void)schedulerDidFinishTransaction:(std::shared_ptr<const MountingCoordinator>)mountingCoordinator
 {
  // no-op, we will flush the transaction from schedulerShouldRenderTransactions
 }

- (void)schedulerShouldRenderTransactions:(MountingCoordinator::Shared)mountingCoordinator
+- (void)schedulerShouldRenderTransactions:(std::shared_ptr<const MountingCoordinator>)mountingCoordinator
 {
  [_mountingManager scheduleTransaction:mountingCoordinator];
 }
@@ -1,3 +1,4 @@
+// @lint-ignore-every LICENSELINT
 /*
 * Copyright (c) 2015 Daniel Kirchner
 *
@@ -27,10 +28,6 @@

 NS_ASSUME_NONNULL_BEGIN

-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /// magic constants :-)
 static const uint64_t PRIME1 = 11400714785074694791ULL;
 static const uint64_t PRIME2 = 14029467366897019727ULL;
@@ -106,13 +103,18 @@ NS_INLINE uint64_t h32bytes(const char *p, uint64_t len, const uint64_t seed)
  return h32bytes_compute(p, len, seed + PRIME1 + PRIME2, seed + PRIME2, seed, seed - PRIME1);
 }

+/*
+  Primary APIs
+ */
+
+NS_INLINE uint64_t meta_xxhash64(const char *p, uint64_t len, uint64_t seed)
+{
+  return finalize((len >= 32 ? h32bytes(p, len, seed) : seed + PRIME5) + len, p + (len & ~0x1FULL), len & 0x1FULL);
+}
+
 NS_INLINE uint64_t FBxxHash64(const char *p, uint64_t len, uint64_t seed)
 {
-  return finalize((len >= 32 ? h32bytes(p, len, seed) : seed + PRIME5) + len, p + (len & ~0x1F), len & 0x1F);
+  return meta_xxhash64(p, len, seed);
 }

-#ifdef __cplusplus
-}
-#endif
-
 NS_ASSUME_NONNULL_END
@@ -50,7 +50,7 @@ NSString *NSStringFromUTF8StringView(std::string_view view)
  dispatch_async(dispatch_get_main_queue(), ^{
    RCTCxxInspectorWebSocketAdapter *strongSelf = weakSelf;
    if (strongSelf) {
-      [strongSelf->_webSocket send:messageStr];
+      [strongSelf->_webSocket sendString:messageStr error:NULL];
    }
  });
 }
@@ -9,6 +9,7 @@

 #import <AVFoundation/AVFoundation.h>
 #import <React/RCTSurfacePresenterStub.h>
+#import <react/featureflags/ReactNativeFeatureFlags.h>

 #import "RCTAssert.h"
 #import "RCTBridge+Private.h"
@@ -1154,10 +1155,10 @@ RCT_EXPORT_METHOD(dispatchViewManagerCommand
    return;
  }

-  __weak typeof(self) weakSelf = self;
+  __weak __typeof(self) weakSelf = self;

  void (^mountingBlock)(void) = ^{
-    typeof(self) strongSelf = weakSelf;
+    __typeof(self) strongSelf = weakSelf;

    @try {
      for (RCTViewManagerUIBlock block in previousPendingUIBlocks) {
@@ -1438,7 +1439,7 @@ NSMutableDictionary<NSString *, id> *RCTModuleConstantsForDestructuredComponent(
  // lazifyViewManagerConfig function in JS. This fuction uses NativeModules global object that is not available in the
  // New Architecture. To make native view configs work in the New Architecture we will populate these properties in
  // native.
-  if (RCTGetUseNativeViewConfigsInBridgelessMode()) {
+  if (facebook::react::ReactNativeFeatureFlags::useNativeViewConfigsInBridgelessMode()) {
    moduleConstants[@"Commands"] = viewConfig[@"Commands"];
    moduleConstants[@"Constants"] = viewConfig[@"Constants"];
  }
@@ -0,0 +1,49 @@
+/*
+ * Copyright (c) Meta Platforms, Inc. and 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>
+#import <XCTest/XCTest.h>
+
+#import <React/RCTTextAttributes.h>
+
+@interface RCTTextAttributesTest : XCTestCase
+
+@end
+
+@implementation RCTTextAttributesTest
+
+- (void)testCapitalize
+{
+  RCTTextAttributes *attrs = [RCTTextAttributes new];
+  attrs.textTransform = RCTTextTransformCapitalize;
+
+  NSString *input = @"hello WORLD from ReAcT nAtIvE 2a !b c";
+  NSString *output = @"Hello WORLD From ReAcT NAtIvE 2a !B C";
+  XCTAssertEqualObjects([attrs applyTextAttributesToText:input], output);
+}
+
+- (void)testUppercase
+{
+  RCTTextAttributes *attrs = [RCTTextAttributes new];
+  attrs.textTransform = RCTTextTransformUppercase;
+
+  NSString *input = @"hello WORLD from ReAcT nAtIvE 2a !b c";
+  NSString *output = @"HELLO WORLD FROM REACT NATIVE 2A !B C";
+  XCTAssertEqualObjects([attrs applyTextAttributesToText:input], output);
+}
+
+- (void)testLowercase
+{
+  RCTTextAttributes *attrs = [RCTTextAttributes new];
+  attrs.textTransform = RCTTextTransformLowercase;
+
+  NSString *input = @"hello WORLD from ReAcT nAtIvE 2a !b c";
+  NSString *output = @"hello world from react native 2a !b c";
+  XCTAssertEqualObjects([attrs applyTextAttributesToText:input], output);
+}
+
+@end
@@ -19,7 +19,7 @@ BOOL RCTBorderInsetsAreEqual(UIEdgeInsets borderInsets)

 BOOL RCTCornerRadiiAreEqualAndSymmetrical(RCTCornerRadii cornerRadii)
 {
-  return cornerRadii.topLeftHorizontal == cornerRadii.topLeftHorizontal &&
+  return cornerRadii.topLeftHorizontal == cornerRadii.topLeftVertical &&
      cornerRadii.topRightHorizontal == cornerRadii.topRightVertical &&
      cornerRadii.bottomLeftHorizontal == cornerRadii.bottomLeftVertical &&
      cornerRadii.bottomRightHorizontal == cornerRadii.bottomRightVertical &&
@@ -8,6 +8,7 @@
 #import "RCTComponentData.h"

 #import <objc/message.h>
+#import <react/featureflags/ReactNativeFeatureFlags.h>

 #import "RCTBridge.h"
 #import "RCTBridgeModule.h"
@@ -288,9 +289,9 @@ static RCTPropBlock createNSInvocationSetter(NSMethodSignature *typeSignature, S
  case _value: {                                                      \
    __block BOOL setDefaultValue = NO;                                \
    __block _type defaultValue;                                       \
-    _type (*convert)(id, SEL, id) = (typeof(convert))objc_msgSend;    \
-    _type (*get)(id, SEL) = (typeof(get))objc_msgSend;                \
-    void (*set)(id, SEL, _type) = (typeof(set))objc_msgSend;          \
+    _type (*convert)(id, SEL, id) = (__typeof(convert))objc_msgSend;  \
+    _type (*get)(id, SEL) = (__typeof(get))objc_msgSend;              \
+    void (*set)(id, SEL, _type) = (__typeof(set))objc_msgSend;        \
    setterBlock = ^(id target, id json) {                             \
      if (json) {                                                     \
        if (!setDefaultValue && target) {                             \
@@ -522,7 +523,7 @@ static RCTPropBlock createNSInvocationSetter(NSMethodSignature *typeSignature, S
    @"baseModuleName" : superClass == [NSObject class] ? (id)kCFNull : RCTViewManagerModuleNameForClass(superClass),
  }];

-  if (RCTGetUseNativeViewConfigsInBridgelessMode()) {
+  if (facebook::react::ReactNativeFeatureFlags::useNativeViewConfigsInBridgelessMode()) {
    result[@"Commands"] = [self commandsForViewMangerClass:managerClass methods:methods methodCount:count];
    result[@"Constants"] = [self constantsForViewMangerClass:managerClass];
  }
@@ -50,6 +50,8 @@
@property (nonatomic, assign) BOOL inverted;
 /** Focus area of newly-activated text input relative to the window to compare against UIKeyboardFrameBegin/End */
@property (nonatomic, assign) CGRect firstResponderFocus;
+/** newly-activated text input outside of the scroll view */
+@property (nonatomic, weak) UIView *firstResponderViewOutsideScrollView;

 // NOTE: currently these event props are only declared so we can export the
 // event names to JS - we don't call the blocks directly because scroll events
@@ -338,6 +338,12 @@ static inline UIViewAnimationOptions animationOptionsWithCurve(UIViewAnimationCu
    if (!didFocusExternalTextField && focusEnd > endFrame.origin.y) {
      // Text field active region is below visible area with keyboard - update diff to bring into view
      contentDiff = endFrame.origin.y - focusEnd;
+    } else {
+      UIView *inputAccessoryView = _firstResponderViewOutsideScrollView.inputAccessoryView;
+      if (inputAccessoryView) {
+        // Text input view is within the inputAccessoryView.
+        contentDiff = endFrame.origin.y - beginFrame.origin.y;
+      }
    }
  } else if (endFrame.origin.y <= beginFrame.origin.y) {
    // Keyboard opened for other reason
@@ -7,23 +7,6 @@ public abstract class com/facebook/react/BaseReactPackage : com/facebook/react/R
 	protected fun getViewManagers (Lcom/facebook/react/bridge/ReactApplicationContext;)Ljava/util/List;
 }

-public class com/facebook/react/CompositeReactPackage : com/facebook/react/ReactPackage, com/facebook/react/ViewManagerOnDemandReactPackage {
-	public fun <init> (Lcom/facebook/react/ReactPackage;Lcom/facebook/react/ReactPackage;[Lcom/facebook/react/ReactPackage;)V
-	public fun createNativeModules (Lcom/facebook/react/bridge/ReactApplicationContext;)Ljava/util/List;
-	public fun createViewManager (Lcom/facebook/react/bridge/ReactApplicationContext;Ljava/lang/String;)Lcom/facebook/react/uimanager/ViewManager;
-	public fun createViewManagers (Lcom/facebook/react/bridge/ReactApplicationContext;)Ljava/util/List;
-	public fun getViewManagerNames (Lcom/facebook/react/bridge/ReactApplicationContext;)Ljava/util/Collection;
-}
-
-public class com/facebook/react/CompositeReactPackageTurboModuleManagerDelegate : com/facebook/react/ReactPackageTurboModuleManagerDelegate {
-	protected fun initHybrid ()Lcom/facebook/jni/HybridData;
-}
-
-public class com/facebook/react/CompositeReactPackageTurboModuleManagerDelegate$Builder : com/facebook/react/ReactPackageTurboModuleManagerDelegate$Builder {
-	public fun <init> (Ljava/util/List;)V
-	protected fun build (Lcom/facebook/react/bridge/ReactApplicationContext;Ljava/util/List;)Lcom/facebook/react/ReactPackageTurboModuleManagerDelegate;
-}
-
 public class com/facebook/react/CoreModulesPackage$$ReactModuleInfoProvider : com/facebook/react/module/model/ReactModuleInfoProvider {
 	public fun <init> ()V
 	public fun getReactModuleInfos ()Ljava/util/Map;
@@ -2042,10 +2025,9 @@ public final class com/facebook/react/common/network/OkHttpCallUtil {
 	public static final fun cancelTag (Lokhttp3/OkHttpClient;Ljava/lang/Object;)V
 }

-public class com/facebook/react/config/ReactFeatureFlags {
+public final class com/facebook/react/config/ReactFeatureFlags {
+	public static final field INSTANCE Lcom/facebook/react/config/ReactFeatureFlags;
 	public static field dispatchPointerEvents Z
-	public static field enableCppPropsIteratorSetter Z
-	public fun <init> ()V
 }

 public final class com/facebook/react/defaults/DefaultComponentsRegistry {
@@ -2076,8 +2058,8 @@ public class com/facebook/react/defaults/DefaultReactActivityDelegate : com/face
 public final class com/facebook/react/defaults/DefaultReactHost {
 	public static final field INSTANCE Lcom/facebook/react/defaults/DefaultReactHost;
 	public static final fun getDefaultReactHost (Landroid/content/Context;Lcom/facebook/react/ReactNativeHost;)Lcom/facebook/react/ReactHost;
-	public static final fun getDefaultReactHost (Landroid/content/Context;Ljava/util/List;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ZZLjava/util/List;)Lcom/facebook/react/ReactHost;
-	public static synthetic fun getDefaultReactHost$default (Landroid/content/Context;Ljava/util/List;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ZZLjava/util/List;ILjava/lang/Object;)Lcom/facebook/react/ReactHost;
+	public static final fun getDefaultReactHost (Landroid/content/Context;Ljava/util/List;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ZZLjava/util/List;Lcom/facebook/react/bridge/JSBundleLoader;)Lcom/facebook/react/ReactHost;
+	public static synthetic fun getDefaultReactHost$default (Landroid/content/Context;Ljava/util/List;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ZZLjava/util/List;Lcom/facebook/react/bridge/JSBundleLoader;ILjava/lang/Object;)Lcom/facebook/react/ReactHost;
 }

 public abstract class com/facebook/react/defaults/DefaultReactNativeHost : com/facebook/react/ReactNativeHost {
@@ -2230,7 +2212,6 @@ public abstract class com/facebook/react/devsupport/DevSupportManagerBase : com/
 	public fun startInspector ()V
 	public fun stopInspector ()V
 	public fun toggleElementInspector ()V
-	public fun updateJSError (Ljava/lang/String;Lcom/facebook/react/bridge/ReadableArray;I)V
 }

 public abstract interface class com/facebook/react/devsupport/DevSupportManagerBase$CallbackWithBundleLoader {
@@ -2398,7 +2379,6 @@ public class com/facebook/react/devsupport/ReleaseDevSupportManager : com/facebo
 	public fun startInspector ()V
 	public fun stopInspector ()V
 	public fun toggleElementInspector ()V
-	public fun updateJSError (Ljava/lang/String;Lcom/facebook/react/bridge/ReadableArray;I)V
 }

 public class com/facebook/react/devsupport/StackTraceHelper {
@@ -2534,7 +2514,6 @@ public abstract interface class com/facebook/react/devsupport/interfaces/DevSupp
 	public abstract fun startInspector ()V
 	public abstract fun stopInspector ()V
 	public abstract fun toggleElementInspector ()V
-	public abstract fun updateJSError (Ljava/lang/String;Lcom/facebook/react/bridge/ReadableArray;I)V
 }

 public abstract interface class com/facebook/react/devsupport/interfaces/DevSupportManager$PackagerLocationCustomizer {
@@ -2594,11 +2573,6 @@ public final class com/facebook/react/fabric/ComponentFactory {
 }

 public class com/facebook/react/fabric/DevToolsReactPerfLogger : com/facebook/react/bridge/ReactMarker$FabricMarkerListener {
-	public static final field mStreamingBatchExecutionStats Lcom/facebook/react/fabric/LongStreamingStats;
-	public static final field mStreamingCommitStats Lcom/facebook/react/fabric/LongStreamingStats;
-	public static final field mStreamingDiffStats Lcom/facebook/react/fabric/LongStreamingStats;
-	public static final field mStreamingLayoutStats Lcom/facebook/react/fabric/LongStreamingStats;
-	public static final field mStreamingTransactionEndStats Lcom/facebook/react/fabric/LongStreamingStats;
 	public fun <init> ()V
 	public fun addDevToolsReactPerfLoggerListener (Lcom/facebook/react/fabric/DevToolsReactPerfLogger$DevToolsReactPerfLoggerListener;)V
 	public fun logFabricMarker (Lcom/facebook/react/bridge/ReactMarkerConstants;Ljava/lang/String;IJ)V
@@ -2634,12 +2608,6 @@ public class com/facebook/react/fabric/DevToolsReactPerfLogger$FabricCommitPoint
 	public fun toString ()Ljava/lang/String;
 }

-public class com/facebook/react/fabric/DevToolsReactPerfLogger$FabricCommitPointData {
-	public fun <init> (JI)V
-	public fun getCounter ()I
-	public fun getTimeStamp ()J
-}
-
 public final class com/facebook/react/fabric/EmptyReactNativeConfig : com/facebook/react/fabric/ReactNativeConfig {
 	public fun <init> ()V
 	public fun getBool (Ljava/lang/String;)Z
@@ -3156,7 +3124,6 @@ public class com/facebook/react/modules/core/ExceptionsManagerModule : com/faceb
 	public fun reportException (Lcom/facebook/react/bridge/ReadableMap;)V
 	public fun reportFatalException (Ljava/lang/String;Lcom/facebook/react/bridge/ReadableArray;D)V
 	public fun reportSoftException (Ljava/lang/String;Lcom/facebook/react/bridge/ReadableArray;D)V
-	public fun updateExceptionMessage (Ljava/lang/String;Lcom/facebook/react/bridge/ReadableArray;D)V
 }

 public class com/facebook/react/modules/core/HeadlessJsTaskSupportModule : com/facebook/fbreact/specs/NativeHeadlessJsTaskSupportSpec {
@@ -3410,14 +3377,26 @@ public final class com/facebook/react/modules/fresco/FrescoModule$Companion {
 	public final fun hasBeenInitialized ()Z
 }

+public final class com/facebook/react/modules/fresco/ImageCacheControl : java/lang/Enum {
+	public static final field DEFAULT Lcom/facebook/react/modules/fresco/ImageCacheControl;
+	public static final field ONLY_IF_CACHED Lcom/facebook/react/modules/fresco/ImageCacheControl;
+	public static final field RELOAD Lcom/facebook/react/modules/fresco/ImageCacheControl;
+	public static fun getEntries ()Lkotlin/enums/EnumEntries;
+	public static fun valueOf (Ljava/lang/String;)Lcom/facebook/react/modules/fresco/ImageCacheControl;
+	public static fun values ()[Lcom/facebook/react/modules/fresco/ImageCacheControl;
+}
+
 public final class com/facebook/react/modules/fresco/ReactNetworkImageRequest : com/facebook/imagepipeline/request/ImageRequest {
 	public static final field Companion Lcom/facebook/react/modules/fresco/ReactNetworkImageRequest$Companion;
-	public synthetic fun <init> (Lcom/facebook/imagepipeline/request/ImageRequestBuilder;Lcom/facebook/react/bridge/ReadableMap;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public synthetic fun <init> (Lcom/facebook/imagepipeline/request/ImageRequestBuilder;Lcom/facebook/react/bridge/ReadableMap;Lcom/facebook/react/modules/fresco/ImageCacheControl;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 	public static final fun fromBuilderWithHeaders (Lcom/facebook/imagepipeline/request/ImageRequestBuilder;Lcom/facebook/react/bridge/ReadableMap;)Lcom/facebook/react/modules/fresco/ReactNetworkImageRequest;
+	public static final fun fromBuilderWithHeaders (Lcom/facebook/imagepipeline/request/ImageRequestBuilder;Lcom/facebook/react/bridge/ReadableMap;Lcom/facebook/react/modules/fresco/ImageCacheControl;)Lcom/facebook/react/modules/fresco/ReactNetworkImageRequest;
 }

 public final class com/facebook/react/modules/fresco/ReactNetworkImageRequest$Companion {
 	public final fun fromBuilderWithHeaders (Lcom/facebook/imagepipeline/request/ImageRequestBuilder;Lcom/facebook/react/bridge/ReadableMap;)Lcom/facebook/react/modules/fresco/ReactNetworkImageRequest;
+	public final fun fromBuilderWithHeaders (Lcom/facebook/imagepipeline/request/ImageRequestBuilder;Lcom/facebook/react/bridge/ReadableMap;Lcom/facebook/react/modules/fresco/ImageCacheControl;)Lcom/facebook/react/modules/fresco/ReactNetworkImageRequest;
+	public static synthetic fun fromBuilderWithHeaders$default (Lcom/facebook/react/modules/fresco/ReactNetworkImageRequest$Companion;Lcom/facebook/imagepipeline/request/ImageRequestBuilder;Lcom/facebook/react/bridge/ReadableMap;Lcom/facebook/react/modules/fresco/ImageCacheControl;ILjava/lang/Object;)Lcom/facebook/react/modules/fresco/ReactNetworkImageRequest;
 }

 public final class com/facebook/react/modules/fresco/SystraceRequestListener : com/facebook/imagepipeline/listener/BaseRequestListener {
@@ -6740,8 +6719,10 @@ public class com/facebook/react/views/imagehelper/ImageSource {
 	public fun <init> (Landroid/content/Context;Ljava/lang/String;)V
 	public fun <init> (Landroid/content/Context;Ljava/lang/String;D)V
 	public fun <init> (Landroid/content/Context;Ljava/lang/String;DD)V
-	public synthetic fun <init> (Landroid/content/Context;Ljava/lang/String;DDILkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public fun <init> (Landroid/content/Context;Ljava/lang/String;DDLcom/facebook/react/modules/fresco/ImageCacheControl;)V
+	public synthetic fun <init> (Landroid/content/Context;Ljava/lang/String;DDLcom/facebook/react/modules/fresco/ImageCacheControl;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
 	public fun equals (Ljava/lang/Object;)Z
+	public final fun getCacheControl ()Lcom/facebook/react/modules/fresco/ImageCacheControl;
 	public final fun getSize ()D
 	public final fun getSource ()Ljava/lang/String;
 	public static final fun getTransparentBitmapImageSource (Landroid/content/Context;)Lcom/facebook/react/views/imagehelper/ImageSource;
@@ -6992,6 +6973,9 @@ public final class com/facebook/react/views/scroll/ReactHorizontalScrollContaine
 	public static final field Companion Lcom/facebook/react/views/scroll/ReactHorizontalScrollContainerViewManager$Companion;
 	public static final field REACT_CLASS Ljava/lang/String;
 	public fun <init> ()V
+	public synthetic fun createViewInstance (ILcom/facebook/react/uimanager/ThemedReactContext;Lcom/facebook/react/uimanager/ReactStylesDiffMap;Lcom/facebook/react/uimanager/StateWrapper;)Landroid/view/View;
+	public synthetic fun createViewInstance (Lcom/facebook/react/uimanager/ThemedReactContext;)Landroid/view/View;
+	public fun createViewInstance (Lcom/facebook/react/uimanager/ThemedReactContext;)Lcom/facebook/react/views/view/ReactViewGroup;
 	public fun getName ()Ljava/lang/String;
 }

@@ -533,9 +533,7 @@ android {
            "-DREACT_BUILD_DIR=$buildDir",
            "-DANDROID_STL=c++_shared",
            "-DANDROID_TOOLCHAIN=clang",
-            // Due to https://github.com/android/ndk/issues/1693 we're losing Android
-            // specific compilation flags. This can be removed once we moved to NDK 25/26
-            "-DANDROID_USE_LEGACY_TOOLCHAIN_FILE=ON")
+            "-DANDROID_SUPPORT_FLEXIBLE_PAGE_SIZES=ON")

        targets(
            "reactnative",
@@ -41,7 +41,7 @@ if (PROJECT_ROOT_DIR)
 endif ()

 file(GLOB input_SRC CONFIGURE_DEPENDS
-        *.cpp
+        ${REACT_ANDROID_DIR}/cmake-utils/default-app-setup/*.cpp
        ${BUILD_DIR}/generated/autolinking/src/main/jni/*.cpp)

 add_library(${CMAKE_PROJECT_NAME} SHARED ${input_SRC})
@@ -228,6 +228,7 @@ android {
            "-DHERMES_IS_ANDROID=True",
            "-DANDROID_STL=c++_shared",
            "-DANDROID_PIE=True",
+            "-DANDROID_SUPPORT_FLEXIBLE_PAGE_SIZES=ON",
            "-DIMPORT_HERMESC=${File(hermesBuildDir, "ImportHermesc.cmake").toString()}",
            "-DJSI_DIR=${jsiDir}",
            "-DHERMES_SLOW_DEBUG=False",
@@ -235,10 +236,7 @@ android {
            "-DHERMES_RELEASE_VERSION=for RN ${version}",
            // We intentionally build Hermes with Intl support only. This is to simplify
            // the build setup and to avoid overcomplicating the build-type matrix.
-            "-DHERMES_ENABLE_INTL=True",
-            // Due to https://github.com/android/ndk/issues/1693 we're losing Android
-            // specific compilation flags. This can be removed once we moved to NDK 25/26
-            "-DANDROID_USE_LEGACY_TOOLCHAIN_FILE=ON")
+            "-DHERMES_ENABLE_INTL=True")

        targets("libhermes")
      }
@@ -262,11 +260,6 @@ android {
          // This has the (unlucky) side effect of letting AGP call the build
          // tasks `configureCMakeRelease` while is actually building the debug flavor.
          arguments("-DCMAKE_BUILD_TYPE=Release")
-          // Adding -O3 to handle the issue here:
-          // https://github.com/android/ndk/issues/1740#issuecomment-1198438260
-          // The old NDK toolchain is not passing -O3 correctly for release CMake builds. This is
-          // fixed in NDK 25 and can be removed once we're there.
-          cppFlags("-O3")
        }
      }
    }
@@ -330,6 +323,11 @@ afterEvaluate {
  tasks.getByName("preBuild").dependsOn(prepareHeadersForPrefab)
 }

+tasks.withType<JavaCompile>().configureEach {
+  options.compilerArgs.add("-Xlint:deprecation,unchecked")
+  options.compilerArgs.add("-Werror")
+}
+
 /* Publishing Configuration */
 apply(from = "../publish.gradle")

@@ -1,30 +0,0 @@
-/*
- * Copyright (c) Meta Platforms, Inc. and 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.debug.debugoverlay.model;
-
-import javax.annotation.concurrent.Immutable;
-
-/** Tag for a debug overlay log message. Name must be unique. */
-@Immutable
-public class DebugOverlayTag {
-
-  /** Name of tag. */
-  public final String name;
-
-  /** Description to display in settings. */
-  public final String description;
-
-  /** Color for tag display. */
-  public final int color;
-
-  public DebugOverlayTag(String name, String description, int color) {
-    this.name = name;
-    this.description = description;
-    this.color = color;
-  }
-}
@@ -0,0 +1,21 @@
+/*
+ * Copyright (c) Meta Platforms, Inc. and 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.debug.debugoverlay.model
+
+/**
+ * Tag for a debug overlay log message. Name must be unique.
+ *
+ * @param name Name of tag.
+ * @param description Description to display in settings.
+ * @param color Color for tag display.
+ */
+public class DebugOverlayTag(
+    public val name: String,
+    public val description: String,
+    public val color: Int,
+)
@@ -1,38 +0,0 @@
-/*
- * Copyright (c) Meta Platforms, Inc. and 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.debug.tags;
-
-import android.graphics.Color;
-import com.facebook.debug.debugoverlay.model.DebugOverlayTag;
-
-/** Category for debug overlays. */
-public class ReactDebugOverlayTags {
-
-  public static final DebugOverlayTag PERFORMANCE =
-      new DebugOverlayTag("Performance", "Markers for Performance", Color.GREEN);
-  public static final DebugOverlayTag NAVIGATION =
-      new DebugOverlayTag("Navigation", "Tag for navigation", Color.rgb(0x9C, 0x27, 0xB0));
-  public static final DebugOverlayTag RN_CORE =
-      new DebugOverlayTag("RN Core", "Tag for React Native Core", Color.BLACK);
-  public static final DebugOverlayTag BRIDGE_CALLS =
-      new DebugOverlayTag(
-          "Bridge Calls", "JS to Java calls (warning: this is spammy)", Color.MAGENTA);
-  public static final DebugOverlayTag NATIVE_MODULE =
-      new DebugOverlayTag("Native Module", "Native Module init", Color.rgb(0x80, 0x00, 0x80));
-  public static final DebugOverlayTag UI_MANAGER =
-      new DebugOverlayTag(
-          "UI Manager",
-          "UI Manager View Operations (requires restart\nwarning: this is spammy)",
-          Color.CYAN);
-  public static final DebugOverlayTag FABRIC_UI_MANAGER =
-      new DebugOverlayTag("FabricUIManager", "Fabric UI Manager View Operations", Color.CYAN);
-  public static final DebugOverlayTag FABRIC_RECONCILER =
-      new DebugOverlayTag("FabricReconciler", "Reconciler for Fabric", Color.CYAN);
-  public static final DebugOverlayTag RELAY =
-      new DebugOverlayTag("Relay", "including prefetching", Color.rgb(0xFF, 0x99, 0x00));
-}
@@ -0,0 +1,45 @@
+/*
+ * Copyright (c) Meta Platforms, Inc. and 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.debug.tags
+
+import android.graphics.Color
+import com.facebook.debug.debugoverlay.model.DebugOverlayTag
+
+/** Category for debug overlays. */
+public object ReactDebugOverlayTags {
+  @JvmField
+  public val PERFORMANCE: DebugOverlayTag =
+      DebugOverlayTag("Performance", "Markers for Performance", Color.GREEN)
+  @JvmField
+  public val NAVIGATION: DebugOverlayTag =
+      DebugOverlayTag("Navigation", "Tag for navigation", Color.rgb(0x9C, 0x27, 0xB0))
+  @JvmField
+  public val RN_CORE: DebugOverlayTag =
+      DebugOverlayTag("RN Core", "Tag for React Native Core", Color.BLACK)
+  @JvmField
+  public val BRIDGE_CALLS: DebugOverlayTag =
+      DebugOverlayTag("Bridge Calls", "JS to Java calls (warning: this is spammy)", Color.MAGENTA)
+  @JvmField
+  public val NATIVE_MODULE: DebugOverlayTag =
+      DebugOverlayTag("Native Module", "Native Module init", Color.rgb(0x80, 0x00, 0x80))
+  @JvmField
+  public val UI_MANAGER: DebugOverlayTag =
+      DebugOverlayTag(
+          "UI Manager",
+          "UI Manager View Operations (requires restart\nwarning: this is spammy)",
+          Color.CYAN)
+  @JvmField
+  public val FABRIC_UI_MANAGER: DebugOverlayTag =
+      DebugOverlayTag("FabricUIManager", "Fabric UI Manager View Operations", Color.CYAN)
+  @JvmField
+  public val FABRIC_RECONCILER: DebugOverlayTag =
+      DebugOverlayTag("FabricReconciler", "Reconciler for Fabric", Color.CYAN)
+  @JvmField
+  public val RELAY: DebugOverlayTag =
+      DebugOverlayTag("Relay", "including prefetching", Color.rgb(0xFF, 0x99, 0x00))
+}
@@ -1,131 +0,0 @@
-/*
- * Copyright (c) Meta Platforms, Inc. and 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 androidx.annotation.Nullable;
-import com.facebook.react.bridge.NativeModule;
-import com.facebook.react.bridge.ReactApplicationContext;
-import com.facebook.react.module.model.ReactModuleInfo;
-import com.facebook.react.module.model.ReactModuleInfoProvider;
-import com.facebook.react.uimanager.ViewManager;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.ListIterator;
-import java.util.Map;
-import java.util.Set;
-
-/**
- * {@code CompositeReactPackage} allows to create a single package composed of views and modules
- * from several other packages.
- *
- * @deprecated
- */
-@Deprecated(
-    since = "CompositeReactPackage is deprecated and will be deleted, use ReactPackage instead",
-    forRemoval = true)
-public class CompositeReactPackage implements ViewManagerOnDemandReactPackage, ReactPackage {
-
-  private final List<ReactPackage> mChildReactPackages = new ArrayList<>();
-
-  /**
-   * The order in which packages are passed matters. It may happen that a NativeModule or a
-   * ViewManager exists in two or more ReactPackages. In that case the latter will win i.e. the
-   * latter will overwrite the former. This re-occurrence is detected by comparing a name of a
-   * module.
-   */
-  public CompositeReactPackage(ReactPackage arg1, ReactPackage arg2, ReactPackage... args) {
-    mChildReactPackages.add(arg1);
-    mChildReactPackages.add(arg2);
-
-    Collections.addAll(mChildReactPackages, args);
-  }
-
-  /** {@inheritDoc} */
-  @Override
-  public List<NativeModule> createNativeModules(ReactApplicationContext reactContext) {
-    // This is for backward compatibility.
-    final Map<String, NativeModule> moduleMap = new HashMap<>();
-    for (ReactPackage reactPackage : mChildReactPackages) {
-      /**
-       * For now, we eagerly initialize the NativeModules inside BaseReactPackages. Ultimately, we
-       * should turn CompositeReactPackage into a BaseReactPackage and remove this eager
-       * initialization.
-       *
-       * <p>TODO: T45627020
-       */
-      if (reactPackage instanceof BaseReactPackage) {
-        BaseReactPackage baseReactPackage = (BaseReactPackage) reactPackage;
-        ReactModuleInfoProvider moduleInfoProvider = baseReactPackage.getReactModuleInfoProvider();
-        Map<String, ReactModuleInfo> moduleInfos = moduleInfoProvider.getReactModuleInfos();
-
-        for (final String moduleName : moduleInfos.keySet()) {
-          moduleMap.put(moduleName, baseReactPackage.getModule(moduleName, reactContext));
-        }
-
-        continue;
-      }
-
-      for (NativeModule nativeModule : reactPackage.createNativeModules(reactContext)) {
-        moduleMap.put(nativeModule.getName(), nativeModule);
-      }
-    }
-    return new ArrayList<>(moduleMap.values());
-  }
-
-  /** {@inheritDoc} */
-  @Override
-  public List<ViewManager> createViewManagers(ReactApplicationContext reactContext) {
-    final Map<String, ViewManager> viewManagerMap = new HashMap<>();
-    for (ReactPackage reactPackage : mChildReactPackages) {
-      for (ViewManager viewManager : reactPackage.createViewManagers(reactContext)) {
-        viewManagerMap.put(viewManager.getName(), viewManager);
-      }
-    }
-    return new ArrayList<>(viewManagerMap.values());
-  }
-
-  /** {@inheritDoc} */
-  @Override
-  public Collection<String> getViewManagerNames(ReactApplicationContext reactContext) {
-    Set<String> uniqueNames = new HashSet<>();
-    for (ReactPackage reactPackage : mChildReactPackages) {
-      if (reactPackage instanceof ViewManagerOnDemandReactPackage) {
-        Collection<String> names =
-            ((ViewManagerOnDemandReactPackage) reactPackage).getViewManagerNames(reactContext);
-        if (names != null) {
-          uniqueNames.addAll(names);
-        }
-      }
-    }
-    return uniqueNames;
-  }
-
-  /** {@inheritDoc} */
-  @Override
-  public @Nullable ViewManager createViewManager(
-      ReactApplicationContext reactContext, String viewManagerName) {
-    ListIterator<ReactPackage> iterator =
-        mChildReactPackages.listIterator(mChildReactPackages.size());
-    while (iterator.hasPrevious()) {
-      ReactPackage reactPackage = iterator.previous();
-      if (reactPackage instanceof ViewManagerOnDemandReactPackage) {
-        ViewManager viewManager =
-            ((ViewManagerOnDemandReactPackage) reactPackage)
-                .createViewManager(reactContext, viewManagerName);
-        if (viewManager != null) {
-          return viewManager;
-        }
-      }
-    }
-    return null;
-  }
-}
@@ -1,57 +0,0 @@
-/*
- * Copyright (c) Meta Platforms, Inc. and 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 androidx.annotation.NonNull;
-import com.facebook.jni.HybridData;
-import com.facebook.proguard.annotations.DoNotStrip;
-import com.facebook.react.bridge.ReactApplicationContext;
-import com.facebook.react.internal.turbomodule.core.TurboModuleManagerDelegate;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-@Deprecated(
-    since =
-        "CompositeReactPackageTurboModuleManagerDelegate is deprecated and will be deleted in the"
-            + " future. Please use ReactPackage interface or BaseReactPackage instead.")
-@DoNotStrip
-public class CompositeReactPackageTurboModuleManagerDelegate
-    extends ReactPackageTurboModuleManagerDelegate {
-
-  protected native HybridData initHybrid();
-
-  private CompositeReactPackageTurboModuleManagerDelegate(
-      ReactApplicationContext context,
-      List<ReactPackage> packages,
-      List<TurboModuleManagerDelegate> delegates) {
-    super(context, packages);
-    for (TurboModuleManagerDelegate delegate : delegates) {
-      addTurboModuleManagerDelegate(delegate);
-    }
-  }
-
-  private native void addTurboModuleManagerDelegate(TurboModuleManagerDelegate delegates);
-
-  public static class Builder extends ReactPackageTurboModuleManagerDelegate.Builder {
-    private final List<ReactPackageTurboModuleManagerDelegate.Builder> mDelegatesBuilder;
-
-    public Builder(@NonNull List<ReactPackageTurboModuleManagerDelegate.Builder> delegatesBuilder) {
-      mDelegatesBuilder = delegatesBuilder;
-    }
-
-    protected ReactPackageTurboModuleManagerDelegate build(
-        ReactApplicationContext context, List<ReactPackage> packages) {
-      List<TurboModuleManagerDelegate> delegates = new ArrayList<>();
-      for (ReactPackageTurboModuleManagerDelegate.Builder delegatesBuilder : mDelegatesBuilder) {
-        delegates.add(delegatesBuilder.build(context, Collections.<ReactPackage>emptyList()));
-      }
-      return new CompositeReactPackageTurboModuleManagerDelegate(context, packages, delegates);
-    }
-  }
-}
@@ -319,7 +319,11 @@ public class ReactDelegate {
  @Nullable
  public ReactRootView getReactRootView() {
    if (ReactNativeFeatureFlags.enableBridgelessArchitecture()) {
-      return (ReactRootView) mReactSurface.getView();
+      if (mReactSurface != null) {
+        return (ReactRootView) mReactSurface.getView();
+      } else {
+        return null;
+      }
    } else {
      return mReactRootView;
    }
@@ -1,31 +0,0 @@
-/*
- * Copyright (c) Meta Platforms, Inc. and 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.config;
-
-import com.facebook.infer.annotation.Nullsafe;
-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
- * public consumption, or for use in experiments.
- *
- * <p>These values are safe defaults and should not require manual changes.
- */
-@Nullsafe(Nullsafe.Mode.LOCAL)
-@Deprecated(since = "Use com.facebook.react.internal.featureflags.ReactNativeFeatureFlags instead.")
-@DoNotStripAny
-public class ReactFeatureFlags {
-
-  public static boolean dispatchPointerEvents = false;
-
-  /**
-   * Enable prop iterator setter-style construction of Props in C++ (this flag is not used in Java).
-   */
-  public static boolean enableCppPropsIteratorSetter = false;
-}
@@ -0,0 +1,24 @@
+/*
+ * Copyright (c) Meta Platforms, Inc. and 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.config
+
+import com.facebook.proguard.annotations.DoNotStripAny
+import kotlin.jvm.JvmField
+
+/**
+ * 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
+ * public consumption, or for use in experiments.
+ *
+ * These values are safe defaults and should not require manual changes.
+ */
+@Deprecated("Use com.facebook.react.internal.featureflags.ReactNativeFeatureFlags instead.")
+@DoNotStripAny
+public object ReactFeatureFlags {
+  @JvmField public var dispatchPointerEvents: Boolean = false
+}
@@ -45,6 +45,7 @@ public object DefaultReactHost {
   * @param useDevSupport whether to enable dev support, default to ReactBuildConfig.DEBUG.
   * @param cxxReactPackageProviders a list of cxxreactpackage providers (to register c++ turbo
   *   modules)
+   * @param jsBundleLoader a [JSBundleLoader] to use for creating the [ReactHost]
   *
   * TODO(T186951312): Should this be @UnstableReactNativeAPI?
   */
@@ -59,25 +60,28 @@ public object DefaultReactHost {
      isHermesEnabled: Boolean = true,
      useDevSupport: Boolean = ReactBuildConfig.DEBUG,
      cxxReactPackageProviders: List<(ReactContext) -> CxxReactPackage> = emptyList(),
+      jsBundleLoader: JSBundleLoader? = null,
  ): ReactHost {
    if (reactHost == null) {
-      val jsBundleLoader =
-          if (jsBundleFilePath != null) {
-            if (jsBundleFilePath.startsWith("assets://")) {
-              JSBundleLoader.createAssetLoader(context, jsBundleFilePath, true)
-            } else {
-              JSBundleLoader.createFileLoader(jsBundleFilePath)
-            }
-          } else {
-            JSBundleLoader.createAssetLoader(context, "assets://$jsBundleAssetPath", true)
-          }
+
+      val bundleLoader =
+          jsBundleLoader
+              ?: if (jsBundleFilePath != null) {
+                if (jsBundleFilePath.startsWith("assets://")) {
+                  JSBundleLoader.createAssetLoader(context, jsBundleFilePath, true)
+                } else {
+                  JSBundleLoader.createFileLoader(jsBundleFilePath)
+                }
+              } else {
+                JSBundleLoader.createAssetLoader(context, "assets://$jsBundleAssetPath", true)
+              }
      val jsRuntimeFactory = if (isHermesEnabled) HermesInstance() else JSCInstance()
      val defaultTmmDelegateBuilder = DefaultTurboModuleManagerDelegate.Builder()
      cxxReactPackageProviders.forEach { defaultTmmDelegateBuilder.addCxxReactPackage(it) }
      val defaultReactHostDelegate =
          DefaultReactHostDelegate(
              jsMainModulePath = jsMainModulePath,
-              jsBundleLoader = jsBundleLoader,
+              jsBundleLoader = bundleLoader,
              reactPackages = packageList,
              jsRuntimeFactory = jsRuntimeFactory,
              turboModuleManagerDelegateBuilder = defaultTmmDelegateBuilder)
@@ -111,7 +111,7 @@ protected constructor(
          packages,
          jsMainModuleName,
          bundleAssetName ?: "index",
-          null,
+          jsBundleFile,
          isHermesEnabled ?: true,
          useDeveloperSupport,
      )
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="com.facebook.react.devsupport">
-  <application>
-    <!-- This activity will be removed for release builds -->
-    <activity android:name="com.facebook.react.devsupport.DevSettingsActivity"
-              android:exported="false"
-    />
-  </application>
-</manifest>
@@ -279,26 +279,6 @@ public abstract class DevSupportManagerBase implements DevSupportManager {
    return errorInfo;
  }

-  @Override
-  public void updateJSError(
-      final String message, final ReadableArray details, final int errorCookie) {
-    UiThreadUtil.runOnUiThread(
-        () -> {
-          // Since we only show the first JS error in a succession of JS errors, make sure we only
-          // update the error message for that error message. This assumes that updateJSError
-          // belongs to the most recent showNewJSError
-          if ((mRedBoxSurfaceDelegate != null && !mRedBoxSurfaceDelegate.isShowing())
-              || errorCookie != mLastErrorCookie) {
-            return;
-          }
-
-          // The RedBox surface delegate will always show the latest error
-          updateLastErrorInfo(
-              message, StackTraceHelper.convertJsStackTrace(details), errorCookie, ErrorType.JS);
-          mRedBoxSurfaceDelegate.show();
-        });
-  }
-
  @Override
  public void hideRedboxDialog() {
    if (mRedBoxSurfaceDelegate == null) {
@@ -613,6 +593,14 @@ public abstract class DevSupportManagerBase implements DevSupportManager {
      // for this manager
      resetCurrentContext(null);
    }
+
+    // If some JNI types (e.g. jni::HybridClass) are used in JSI (e.g. jsi::HostObject), they might
+    // not be immediately deleted on an app refresh as both Java and JavaScript are
+    // garbage-collected languages and the memory might float around for a while. For C++
+    // developers, this will be hard to debug as destructors might be called at a later point, so in
+    // this case we trigger a Java GC to maybe eagerly collect such objects when the app
+    // reloads.
+    System.gc();
  }

  @Override
@@ -144,7 +144,12 @@ class RedBoxDialogSurfaceDelegate implements SurfaceDelegate {
  public void hide() {
    // dismiss redbox if exists
    if (mDialog != null) {
-      mDialog.dismiss();
+      try {
+        mDialog.dismiss();
+      } catch (IllegalArgumentException e) {
+        FLog.e(
+            ReactConstants.TAG, "RedBoxDialogSurfaceDelegate: error while dismissing dialog: ", e);
+      }
      destroyContentView();
      mDialog = null;
    }
@@ -53,12 +53,6 @@ public open class ReleaseDevSupportManager : DevSupportManager {

  override public fun destroyRootView(rootView: View?): Unit = Unit

-  override public fun updateJSError(
-      message: String?,
-      details: ReadableArray?,
-      errorCookie: Int
-  ): Unit = Unit
-
  override public fun hideRedboxDialog(): Unit = Unit

  override public fun showDevOptionsDialog(): Unit = Unit
@@ -48,8 +48,6 @@ public interface DevSupportManager : JSExceptionHandler {

  public fun showNewJSError(message: String?, details: ReadableArray?, errorCookie: Int)

-  public fun updateJSError(message: String?, details: ReadableArray?, errorCookie: Int)
-
  public fun hideRedboxDialog()

  public fun showDevOptionsDialog()
@@ -37,18 +37,17 @@ public class DevToolsReactPerfLogger implements ReactMarker.FabricMarkerListener
  private final List<DevToolsReactPerfLoggerListener> mDevToolsReactPerfLoggerListeners =
      new ArrayList<>();

-  public static final LongStreamingStats mStreamingCommitStats = new LongStreamingStats();
-  public static final LongStreamingStats mStreamingLayoutStats = new LongStreamingStats();
-  public static final LongStreamingStats mStreamingDiffStats = new LongStreamingStats();
-  public static final LongStreamingStats mStreamingTransactionEndStats = new LongStreamingStats();
-  public static final LongStreamingStats mStreamingBatchExecutionStats = new LongStreamingStats();
+  static final LongStreamingStats mStreamingCommitStats = new LongStreamingStats();
+  static final LongStreamingStats mStreamingLayoutStats = new LongStreamingStats();
+  static final LongStreamingStats mStreamingDiffStats = new LongStreamingStats();
+  static final LongStreamingStats mStreamingTransactionEndStats = new LongStreamingStats();
+  static final LongStreamingStats mStreamingBatchExecutionStats = new LongStreamingStats();

  public interface DevToolsReactPerfLoggerListener {
-
    void onFabricCommitEnd(FabricCommitPoint commitPoint);
  }

-  public static class FabricCommitPointData {
+  private static class FabricCommitPointData {
    private final long mTimeStamp;
    private final int mCounter;

@@ -1,76 +0,0 @@
-/*
- * Copyright (c) Meta Platforms, Inc. and 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 java.util.Comparator;
-import java.util.PriorityQueue;
-import java.util.Queue;
-
-/* package */
-class LongStreamingStats {
-  // TODO(T138627466): Calculate median value with better algorithm after Android API 24.
-  private final Queue<Long> minHeap =
-      new PriorityQueue<>(11, Comparator.comparingLong(aLong -> aLong));
-  private final Queue<Long> maxHeap =
-      new PriorityQueue<>(
-          11,
-          (first, second) -> {
-            // Reversed order
-            return Long.compare(second, first);
-          });
-  private double streamingAverage = 0.0;
-  private int len = 0;
-  private long max = 0;
-
-  LongStreamingStats() {}
-
-  public void add(long n) {
-    // To make medians more useful, we discard all zero values
-    // This isn't perfect and certainly makes this a totally invalid median, but, alas...
-    if (n != 0) {
-      if (minHeap.size() == maxHeap.size()) {
-        maxHeap.offer(n);
-        minHeap.offer(maxHeap.poll());
-      } else {
-        minHeap.offer(n);
-        maxHeap.offer(minHeap.poll());
-      }
-    }
-
-    len++;
-    if (len == 1) {
-      streamingAverage = n;
-    } else {
-      streamingAverage = (streamingAverage / (len / (len - 1))) + (n / len);
-    }
-
-    max = (n > max ? n : max);
-  }
-
-  public double getMedian() {
-    if (minHeap.size() == 0 && maxHeap.size() == 0) {
-      return 0;
-    }
-
-    long median;
-    if (minHeap.size() > maxHeap.size()) {
-      median = minHeap.peek();
-    } else {
-      median = (minHeap.peek() + maxHeap.peek()) / 2;
-    }
-    return median;
-  }
-
-  public double getAverage() {
-    return streamingAverage;
-  }
-
-  public long getMax() {
-    return max;
-  }
-}
@@ -0,0 +1,62 @@
+/*
+ * Copyright (c) Meta Platforms, Inc. and 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 java.util.PriorityQueue
+import java.util.Queue
+import kotlin.comparisons.reverseOrder
+
+internal class LongStreamingStats {
+
+  // TODO(T138627466): Calculate median value with better algorithm after Android API 24.
+  private val minHeap: Queue<Long> = PriorityQueue(11)
+  private val maxHeap: Queue<Long> = PriorityQueue(11, reverseOrder())
+  var average: Double = 0.0
+    private set
+
+  private var len = 0
+  var max: Long = 0L
+    private set
+
+  fun add(n: Long) {
+    // To make medians more useful, we discard all zero values
+    // This isn't perfect and certainly makes this a totally invalid median, but, alas...
+    if (n != 0L) {
+      if (minHeap.size == maxHeap.size) {
+        maxHeap.offer(n)
+        minHeap.offer(maxHeap.poll())
+      } else {
+        minHeap.offer(n)
+        maxHeap.offer(minHeap.poll())
+      }
+    }
+
+    len++
+    if (len == 1) {
+      average = n.toDouble()
+    } else {
+      average = (average / (len / (len - 1))) + (n / len)
+    }
+
+    max = (if (n > max) n else max)
+  }
+
+  val median: Double
+    get() {
+      if (minHeap.size == 0 && maxHeap.size == 0) {
+        return 0.0
+      }
+      val median =
+          if (minHeap.size > maxHeap.size) {
+            minHeap.peek()
+          } else {
+            (minHeap.peek() ?: 0 + maxHeap.peek()!!) / 2
+          }
+      return median.toDouble()
+    }
+}
--- a/Show More
+++ b/Show More