Fix CQS signal performance-faster-string-find in xplat/js/react-native-github/packages

Reviewed By: javache

Differential Revision: D78252727

.editorconfig

@@ -9,3 +9,12 @@ end_of_line = lf
 insert_final_newline = true
 indent_style = space
 indent_size = 2
+
+[*.gradle]
+indent_size = 4
+
+[*.kts]
+indent_size = 4
+
+[BUCK]
+indent_size = 4

.github/actions/build-hermesc-windows/action.yml

@@ -14,23 +14,23 @@ runs:
       uses: actions/download-artifact@v4
       with:
         name: hermes-workspace
-        path: 'C:\tmp\hermes'
+        path: 'D:\tmp\hermes'
     - name: Set up workspace
       shell: powershell
       run: |
-        mkdir -p C:\tmp\hermes\osx-bin
+        mkdir -p D:\tmp\hermes\osx-bin
         mkdir -p .\packages\react-native\sdks\hermes
-        cp -r -Force C:\tmp\hermes\hermes\* .\packages\react-native\sdks\hermes\.
+        cp -r -Force D:\tmp\hermes\hermes\* .\packages\react-native\sdks\hermes\.
         cp -r -Force .\packages\react-native\sdks\hermes-engine\utils\* .\packages\react-native\sdks\hermes\.
     - name: Windows cache
       uses: actions/cache@v4
       with:
         key: v3-hermes-${{ github.job }}-windows-${{ inputs.hermes-version }}-${{ inputs.react-native-version }}
         path: |
-          C:\tmp\hermes\win64-bin\
-          C:\tmp\hermes\hermes\icu\
-          C:\tmp\hermes\hermes\deps\
-          C:\tmp\hermes\hermes\build_release\
+          D:\tmp\hermes\win64-bin\
+          D:\tmp\hermes\hermes\icu\
+          D:\tmp\hermes\hermes\deps\
+          D:\tmp\hermes\hermes\build_release\
     - name: setup-msbuild
       uses: microsoft/setup-msbuild@v1.3.2
     - name: Set up workspace
@@ -83,4 +83,4 @@ runs:
       uses: actions/upload-artifact@v4.3.4
       with:
         name: hermes-win64-bin
-        path: C:\tmp\hermes\win64-bin\
+        path: D:\tmp\hermes\win64-bin\

.github/workflows/nightly.yml

@@ -128,9 +128,9 @@ jobs:
     runs-on: windows-2025
     needs: prepare_hermes_workspace
     env:
-      HERMES_WS_DIR: 'C:\tmp\hermes'
-      HERMES_TARBALL_ARTIFACTS_DIR: 'C:\tmp\hermes\hermes-runtime-darwin'
-      HERMES_OSXBIN_ARTIFACTS_DIR: 'C:\tmp\hermes\osx-bin'
+      HERMES_WS_DIR: 'D:\tmp\hermes'
+      HERMES_TARBALL_ARTIFACTS_DIR: 'D:\tmp\hermes\hermes-runtime-darwin'
+      HERMES_OSXBIN_ARTIFACTS_DIR: 'D:\tmp\hermes\osx-bin'
       ICU_URL: "https://github.com/unicode-org/icu/releases/download/release-64-2/icu4c-64_2-Win64-MSVC2017.zip"
       MSBUILD_DIR: 'C:\Program Files (x86)\Microsoft Visual Studio\2019\BuildTools\MSBuild\Current\Bin'
       CMAKE_DIR: 'C:\Program Files\CMake\bin'

.github/workflows/publish-release.yml

@@ -125,9 +125,9 @@ jobs:
     runs-on: windows-2025
     needs: prepare_hermes_workspace
     env:
-      HERMES_WS_DIR: 'C:\tmp\hermes'
-      HERMES_TARBALL_ARTIFACTS_DIR: 'C:\tmp\hermes\hermes-runtime-darwin'
-      HERMES_OSXBIN_ARTIFACTS_DIR: 'C:\tmp\hermes\osx-bin'
+      HERMES_WS_DIR: 'D:\tmp\hermes'
+      HERMES_TARBALL_ARTIFACTS_DIR: 'D:\tmp\hermes\hermes-runtime-darwin'
+      HERMES_OSXBIN_ARTIFACTS_DIR: 'D:\tmp\hermes\osx-bin'
       ICU_URL: "https://github.com/unicode-org/icu/releases/download/release-64-2/icu4c-64_2-Win64-MSVC2017.zip"
       MSBUILD_DIR: 'C:\Program Files (x86)\Microsoft Visual Studio\2019\BuildTools\MSBuild\Current\Bin'
       CMAKE_DIR: 'C:\Program Files\CMake\bin'

.github/workflows/test-all.yml

@@ -382,9 +382,9 @@ jobs:
     runs-on: windows-2025
     needs: prepare_hermes_workspace
     env:
-      HERMES_WS_DIR: 'C:\tmp\hermes'
-      HERMES_TARBALL_ARTIFACTS_DIR: 'C:\tmp\hermes\hermes-runtime-darwin'
-      HERMES_OSXBIN_ARTIFACTS_DIR: 'C:\tmp\hermes\osx-bin'
+      HERMES_WS_DIR: 'D:\tmp\hermes'
+      HERMES_TARBALL_ARTIFACTS_DIR: 'D:\tmp\hermes\hermes-runtime-darwin'
+      HERMES_OSXBIN_ARTIFACTS_DIR: 'D:\tmp\hermes\osx-bin'
       ICU_URL: "https://github.com/unicode-org/icu/releases/download/release-64-2/icu4c-64_2-Win64-MSVC2017.zip"
       MSBUILD_DIR: 'C:\Program Files (x86)\Microsoft Visual Studio\2019\BuildTools\MSBuild\Current\Bin'
       CMAKE_DIR: 'C:\Program Files\CMake\bin'
@@ -583,7 +583,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        node-version: ["24", "22", "20"]
+        node-version: ["24", "22"]
     steps:
       - name: Checkout
         uses: actions/checkout@v4

CHANGELOG.md

@@ -1,35 +1,5 @@
 # Changelog
 
-## v0.81.0-rc.1
-
-### Added
-
-#### iOS specific
-
-- Add release/debug switch script for React-Core-prebuilt ([42d1a7934c](https://github.com/facebook/react-native/commit/42d1a7934cad4b2c92653e3fa7781c2af8f44df4) by [@chrfalch](https://github.com/chrfalch))
-- Added support for using USE_FRAMEWORKS with prebuilt React Native Core ([40e45f5366](https://github.com/facebook/react-native/commit/40e45f53661ce80c3a6fbbf07f52dc900afcad52) by [@chrfalch](https://github.com/chrfalch))
-- Add the `ENTERPRISE_REPOSITORY` env variable to cocopaods infra ([23f3bf9239](https://github.com/facebook/react-native/commit/23f3bf9239a849590f1c72b25732d0090780128c) by [@cipolleschi](https://github.com/cipolleschi))
-
-### Changed
-
-- Bump Metro to 0.83.0 ([6b9f5d622f](https://github.com/facebook/react-native/commit/6b9f5d622ffbe79da8f4e7b7d8094504a480425e) by [@robhogan](https://github.com/robhogan))
-
-#### Android specific
-
-- Gradle to 8.14.3 ([6892dde363](https://github.com/facebook/react-native/commit/6892dde36373bbef2d0afe535ae818b1a7164f08) by [@cortinico](https://github.com/cortinico))
-- Expose `react_renderer_bridging` headers via prefab ([d1730ff960](https://github.com/facebook/react-native/commit/d1730ff960fcb9a01ee94b9e46e5a9fbb7d73f4a) by [@tomekzaw](https://github.com/tomekzaw))
-- Introduce more deprecation warnings for Legacy Arch classes ([625f69f284](https://github.com/facebook/react-native/commit/625f69f284ddfd9c6beecaa4052a871d092053ef) by [@cortinico](https://github.com/cortinico))
-
-
-### Fixed
-
-- Fixed nodes with `display: contents` set being cloned with the wrong owner ([d4b36b0300](https://github.com/facebook/react-native/commit/d4b36b03003eb2de9eaf5b57bb639bae8cc12f20) by [@j-piasecki](https://github.com/j-piasecki))
-
-#### iOS specific
-
-- Fixed premature return in header file generation from podspec globs ([f2b064c2d4](https://github.com/facebook/react-native/commit/f2b064c2d40c39017ac2a31bf3caf8acef23038c) by [@chrfalch](https://github.com/chrfalch))
-
-
 ## v0.81.0-rc.0
 
 ### Breaking

build.gradle.kts

@@ -13,7 +13,6 @@ plugins {
   alias(libs.plugins.kotlin.android) apply false
   alias(libs.plugins.binary.compatibility.validator) apply true
   alias(libs.plugins.android.test) apply false
-  alias(libs.plugins.ktfmt) apply true
 }
 
 val reactAndroidProperties = java.util.Properties()
@@ -131,30 +130,3 @@ if (project.findProperty("react.internal.useHermesNightly")?.toString()?.toBoole
     }
   }
 }
-
-ktfmt {
-  blockIndent.set(2)
-  continuationIndent.set(4)
-  maxWidth.set(100)
-  removeUnusedImports.set(false)
-  manageTrailingCommas.set(false)
-}
-
-// Configure ktfmt tasks to include gradle-plugin
-listOf("ktfmtCheck", "ktfmtFormat").forEach { taskName ->
-  tasks.named(taskName) { dependsOn(gradle.includedBuild("gradle-plugin").task(":$taskName")) }
-}
-
-allprojects {
-  // Apply exclusions for specific files that should not be formatted
-  val excludePatterns =
-      listOf(
-          "**/build/**",
-          "**/hermes-engine/**",
-          "**/internal/featureflags/**",
-          "**/systeminfo/ReactNativeVersion.kt")
-  listOf(
-          com.ncorti.ktfmt.gradle.tasks.KtfmtCheckTask::class,
-          com.ncorti.ktfmt.gradle.tasks.KtfmtFormatTask::class)
-      .forEach { tasks.withType(it) { exclude(excludePatterns) } }
-}

package.json

@@ -19,8 +19,6 @@
     "featureflags": "yarn --cwd packages/react-native featureflags",
     "js-api-diff": "node ./scripts/js-api/diff-api-snapshot",
     "lint-ci": "./.github/workflow-scripts/analyze_code.sh && yarn shellcheck",
-    "lint-kotlin-check": "./gradlew ktfmtCheck",
-    "lint-kotlin": "./gradlew ktfmtFormat",
     "lint-markdown": "markdownlint-cli2 2>&1",
     "lint": "eslint --max-warnings 0 .",
     "prettier": "prettier --write \"./**/*.{js,md,yml,ts,tsx}\"",

packages/assets/package.json

@@ -17,7 +17,7 @@
   ],
   "bugs": "https://github.com/facebook/react-native/issues",
   "engines": {
-    "node": ">= 20.19.4"
+    "node": ">= 22.14.0"
   },
   "files": [
     "path-support.js",

packages/babel-plugin-codegen/package.json

@@ -19,7 +19,7 @@
   ],
   "bugs": "https://github.com/facebook/react-native/issues",
   "engines": {
-    "node": ">= 20.19.4"
+    "node": ">= 22.14.0"
   },
   "files": [
     "index.js"

packages/community-cli-plugin/package.json

@@ -43,6 +43,6 @@
     }
   },
   "engines": {
-    "node": ">= 20.19.4"
+    "node": ">= 22.14.0"
   }
 }

packages/core-cli-utils/package.json

@@ -21,7 +21,7 @@
   ],
   "bugs": "https://github.com/facebook/react-native/issues",
   "engines": {
-    "node": ">= 20.19.4"
+    "node": ">= 22.14.0"
   },
   "files": [
     "dist"

packages/debugger-frontend/BUILD_INFO

@@ -1,5 +1,5 @@
-@generated SignedSource<<e2d97b04634bf3b566f33d455f38658f>>
-Git revision: 8dc0d5b365e6b4600b78e5a7381aa861d8c1c81e
+@generated SignedSource<<1ce3fb7dd23581737fedaf58528fe575>>
+Git revision: 844f225009e6445d088ed0e431d1fc430325ed95
 Built with --nohooks: false
 Is local checkout: false
 Remote URL: https://github.com/facebook/react-native-devtools-frontend

packages/debugger-frontend/package.json

@@ -20,6 +20,6 @@
     "BUILD_INFO"
   ],
   "engines": {
-    "node": ">= 20.19.4"
+    "node": ">= 22.14.0"
   }
 }

packages/debugger-shell/package.json

@@ -26,7 +26,7 @@
   },
   "license": "MIT",
   "engines": {
-    "node": ">= 20.19.4",
+    "node": ">= 22.14.0",
     "electron": ">=36.3.0"
   },
   "dependencies": {

packages/debugger-shell/src/electron/index.flow.js

@@ -10,25 +10,9 @@
 
 // $FlowFixMe[unclear-type] We have no Flow types for the Electron API.
 const {app} = require('electron') as any;
-const util = require('util');
-
-// Handle global command line arguments which don't require a window
-// or the single instance lock to be held.
-const {
-  values: {version = false},
-} = util.parseArgs({
-  options: {version: {type: 'boolean'}},
-  args: process.argv.slice(app.isPackaged ? 1 : 2),
-  strict: false,
-});
-if (version) {
-  console.log(`${app.getName()} v${app.getVersion()}`);
-  // Not app.quit() - we want to exit immediately without initialising the graphical subsystem.
-  app.exit(0);
-}
 
 const gotTheLock = app.requestSingleInstanceLock({
-  argv: process.argv.slice(app.isPackaged ? 1 : 2),
+  argv: process.argv.slice(2),
 });
 
 if (!gotTheLock) {

packages/dev-middleware/package.json

@@ -35,7 +35,7 @@
     "ws": "^6.2.3"
   },
   "engines": {
-    "node": ">= 20.19.4"
+    "node": ">= 22.14.0"
   },
   "devDependencies": {
     "selfsigned": "^2.4.1",

packages/eslint-config-react-native/package.json

@@ -16,7 +16,7 @@
   ],
   "bugs": "https://github.com/facebook/react-native/issues",
   "engines": {
-    "node": ">= 20.19.4"
+    "node": ">= 22.14.0"
   },
   "main": "index.js",
   "dependencies": {

packages/eslint-plugin-react-native/package.json

@@ -22,6 +22,6 @@
     "hermes-eslint": "0.29.1"
   },
   "engines": {
-    "node": ">= 20.19.4"
+    "node": ">= 22.14.0"
   }
 }

packages/eslint-plugin-specs/package.json

@@ -36,6 +36,6 @@
     "hermes-eslint": "0.29.1"
   },
   "engines": {
-    "node": ">= 20.19.4"
+    "node": ">= 22.14.0"
   }
 }

packages/gradle-plugin/build.gradle.kts

@@ -5,10 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-plugins {
-  alias(libs.plugins.kotlin.jvm).apply(false)
-  alias(libs.plugins.ktfmt).apply(true)
-}
+plugins { alias(libs.plugins.kotlin.jvm).apply(false) }
 
 tasks.register("build") {
   dependsOn(
@@ -27,21 +24,3 @@ tasks.register("clean") {
       ":shared:clean",
   )
 }
-
-tasks.named("ktfmtCheck") {
-  dependsOn(
-      ":react-native-gradle-plugin:ktfmtCheck",
-      ":settings-plugin:ktfmtCheck",
-      ":shared-testutil:ktfmtCheck",
-      ":shared:ktfmtCheck",
-  )
-}
-
-tasks.named("ktfmtFormat") {
-  dependsOn(
-      ":react-native-gradle-plugin:ktfmtFormat",
-      ":settings-plugin:ktfmtFormat",
-      ":shared-testutil:ktfmtFormat",
-      ":shared:ktfmtFormat",
-  )
-}

packages/gradle-plugin/gradle/libs.versions.toml

@@ -6,7 +6,6 @@ javapoet = "1.13.0"
 junit = "4.13.2"
 kotlin = "2.1.20"
 assertj = "3.25.1"
-ktfmt = "0.22.0"
 
 [libraries]
 kotlin-gradle-plugin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin" }
@@ -19,4 +18,3 @@ assertj = { module = "org.assertj:assertj-core", version.ref = "assertj" }
 
 [plugins]
 kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
-ktfmt = { id = "com.ncorti.ktfmt.gradle", version.ref = "ktfmt" }

packages/gradle-plugin/package.json

@@ -16,7 +16,7 @@
   ],
   "bugs": "https://github.com/facebook/react-native/issues",
   "engines": {
-    "node": ">= 20.19.4"
+    "node": ">= 22.14.0"
   },
   "scripts": {
     "build": "./gradlew build",

packages/gradle-plugin/react-native-gradle-plugin/build.gradle.kts

@@ -12,7 +12,6 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
   alias(libs.plugins.kotlin.jvm)
-  alias(libs.plugins.ktfmt)
   id("java-gradle-plugin")
 }
 

packages/gradle-plugin/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/ReactPlugin.kt

@@ -18,7 +18,6 @@ import com.facebook.react.tasks.GenerateEntryPointTask
 import com.facebook.react.tasks.GeneratePackageListTask
 import com.facebook.react.utils.AgpConfiguratorUtils.configureBuildConfigFieldsForApp
 import com.facebook.react.utils.AgpConfiguratorUtils.configureBuildConfigFieldsForLibraries
-import com.facebook.react.utils.AgpConfiguratorUtils.configureBuildTypesForApp
 import com.facebook.react.utils.AgpConfiguratorUtils.configureDevServerLocation
 import com.facebook.react.utils.AgpConfiguratorUtils.configureNamespaceForLibraries
 import com.facebook.react.utils.BackwardCompatUtils.configureBackwardCompatibilityReactMap
@@ -85,7 +84,6 @@ class ReactPlugin : Plugin<Project> {
       configureAutolinking(project, extension)
       configureCodegen(project, extension, rootExtension, isLibrary = false)
       configureResources(project, extension)
-      configureBuildTypesForApp(project)
     }
 
     // Library Only Configuration

packages/gradle-plugin/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/utils/AgpConfiguratorUtils.kt

@@ -19,7 +19,6 @@ import java.net.Inet4Address
 import java.net.NetworkInterface
 import javax.xml.parsers.DocumentBuilder
 import javax.xml.parsers.DocumentBuilderFactory
-import kotlin.plus
 import org.gradle.api.Action
 import org.gradle.api.Project
 import org.gradle.api.plugins.AppliedPlugin
@@ -28,26 +27,6 @@ import org.w3c.dom.Element
 @Suppress("UnstableApiUsage")
 internal object AgpConfiguratorUtils {
 
-  fun configureBuildTypesForApp(project: Project) {
-    val action =
-        Action<AppliedPlugin> {
-          project.extensions
-              .getByType(ApplicationAndroidComponentsExtension::class.java)
-              .finalizeDsl { ext ->
-                ext.buildTypes {
-                  val debug =
-                      getByName("debug").apply {
-                        manifestPlaceholders["usesCleartextTraffic"] = "true"
-                      }
-                  getByName("release").apply {
-                    manifestPlaceholders["usesCleartextTraffic"] = "false"
-                  }
-                }
-              }
-        }
-    project.pluginManager.withPlugin("com.android.application", action)
-  }
-
   fun configureBuildConfigFieldsForApp(project: Project, extension: ReactExtension) {
     val action =
         Action<AppliedPlugin> {

packages/gradle-plugin/settings-plugin/build.gradle.kts

@@ -12,7 +12,6 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
   alias(libs.plugins.kotlin.jvm)
-  alias(libs.plugins.ktfmt)
   id("java-gradle-plugin")
 }
 

packages/gradle-plugin/shared-testutil/build.gradle.kts

@@ -10,10 +10,7 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 import org.jetbrains.kotlin.gradle.dsl.KotlinVersion
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
-plugins {
-  alias(libs.plugins.kotlin.jvm)
-  alias(libs.plugins.ktfmt)
-}
+plugins { alias(libs.plugins.kotlin.jvm) }
 
 repositories { mavenCentral() }
 

packages/gradle-plugin/shared/build.gradle.kts

@@ -10,10 +10,7 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 import org.jetbrains.kotlin.gradle.dsl.KotlinVersion
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
-plugins {
-  alias(libs.plugins.kotlin.jvm)
-  alias(libs.plugins.ktfmt)
-}
+plugins { alias(libs.plugins.kotlin.jvm) }
 
 repositories { mavenCentral() }
 

packages/metro-config/package.json

@@ -16,7 +16,7 @@
   ],
   "bugs": "https://github.com/facebook/react-native/issues",
   "engines": {
-    "node": ">= 20.19.4"
+    "node": ">= 22.14.0"
   },
   "exports": {
     ".": "./src/index.js",

packages/new-app-screen/package.json

@@ -30,6 +30,6 @@
     }
   },
   "engines": {
-    "node": ">= 20.19.4"
+    "node": ">= 22.14.0"
   }
 }

packages/polyfills/__tests__/consoleTimeStamp-itest.js

@@ -16,7 +16,6 @@ describe('console.timeStamp()', () => {
   });
 
   it("doesn't throw when label is not specified", () => {
-    // $FlowExpectedError[incompatible-call] not passing label intentionally
     expect(() => console.timeStamp()).not.toThrow();
   });
 
@@ -26,6 +25,7 @@ describe('console.timeStamp()', () => {
 
   it("doesn't throw when additional arguments are specified", () => {
     expect(() =>
+      // $FlowExpectedError[extra-arg]
       console.timeStamp('label', 100, 500, 'Track', 'Group', 'error'),
     ).not.toThrow();
   });
@@ -34,7 +34,7 @@ describe('console.timeStamp()', () => {
     // $FlowExpectedError[incompatible-call]
     expect(() => console.timeStamp({})).not.toThrow();
     expect(() =>
-      // $FlowExpectedError[incompatible-call]
+      // $FlowExpectedError[extra-arg]
       console.timeStamp('label', true, null, {}, [], () => {}),
     ).not.toThrow();
   });

packages/polyfills/console.js

@@ -569,7 +569,10 @@ function consoleAssertPolyfill(expression, label) {
   }
 }
 
-function stub() {}
+// https://developer.mozilla.org/en-US/docs/Web/API/console/timeStamp_static.
+// Non-standard API for recording markers on a timeline of the Performance instrumentation.
+// The actual logging is not provided by definition.
+function consoleTimeStampPolyfill() {}
 
 if (global.nativeLoggingHook) {
   const originalConsole = global.console;
@@ -582,11 +585,7 @@ if (global.nativeLoggingHook) {
   }
 
   global.console = {
-    time: stub,
-    timeEnd: stub,
-    timeStamp: stub,
-    count: stub,
-    countReset: stub,
+    timeStamp: consoleTimeStampPolyfill,
     ...(originalConsole ?? {}),
     error: getNativeLogFunction(LOG_LEVELS.error),
     info: getNativeLogFunction(LOG_LEVELS.info),
@@ -677,6 +676,7 @@ if (global.nativeLoggingHook) {
     });
   }
 } else if (!global.console) {
+  function stub() {}
   const log = global.print || stub;
 
   global.console = {
@@ -692,8 +692,6 @@ if (global.nativeLoggingHook) {
       }
     },
     clear: stub,
-    count: stub,
-    countReset: stub,
     dir: stub,
     dirxml: stub,
     group: stub,
@@ -702,8 +700,6 @@ if (global.nativeLoggingHook) {
     profile: stub,
     profileEnd: stub,
     table: stub,
-    time: stub,
-    timeEnd: stub,
     timeStamp: stub,
   };
 

packages/polyfills/package.json

@@ -18,7 +18,7 @@
   ],
   "bugs": "https://github.com/facebook/react-native/issues",
   "engines": {
-    "node": ">= 20.19.4"
+    "node": ">= 22.14.0"
   },
   "files": [
     "console.js",

packages/react-native-babel-preset/package.json

@@ -13,7 +13,7 @@
   ],
   "license": "MIT",
   "engines": {
-    "node": ">= 20.19.4"
+    "node": ">= 22.14.0"
   },
   "main": "src/index.js",
   "files": [

packages/react-native-babel-preset/src/configs/main.js

@@ -38,6 +38,19 @@ function isFirstParty(fileName) {
 // use `this.foo = bar` instead of `this.defineProperty('foo', ...)`
 const loose = true;
 
+const defaultPlugins = [
+  [require('babel-plugin-syntax-hermes-parser'), {parseLangTypes: 'flow'}],
+  [require('babel-plugin-transform-flow-enums')],
+  [require('@babel/plugin-transform-block-scoping')],
+  [require('@babel/plugin-transform-class-properties'), {loose}],
+  [require('@babel/plugin-transform-private-methods'), {loose}],
+  [require('@babel/plugin-transform-private-property-in-object'), {loose}],
+  [require('@babel/plugin-syntax-dynamic-import')],
+  [require('@babel/plugin-syntax-export-default-from')],
+  ...passthroughSyntaxPlugins,
+  [require('@babel/plugin-transform-unicode-regex')],
+];
+
 // For Static Hermes testing (experimental), the hermes-canary transformProfile
 // is used to enable regenerator (and some related lowering passes) because SH
 // requires more Babel lowering than Hermes temporarily.
@@ -221,28 +234,7 @@ const getPreset = (src, options) => {
         plugins: [require('@babel/plugin-transform-flow-strip-types')],
       },
       {
-        plugins: [
-          [
-            require('babel-plugin-syntax-hermes-parser'),
-            {
-              parseLangTypes: 'flow',
-              reactRuntimeTarget: '19',
-              ...options.hermesParserOptions,
-            },
-          ],
-          [require('babel-plugin-transform-flow-enums')],
-          [require('@babel/plugin-transform-block-scoping')],
-          [require('@babel/plugin-transform-class-properties'), {loose}],
-          [require('@babel/plugin-transform-private-methods'), {loose}],
-          [
-            require('@babel/plugin-transform-private-property-in-object'),
-            {loose},
-          ],
-          [require('@babel/plugin-syntax-dynamic-import')],
-          [require('@babel/plugin-syntax-export-default-from')],
-          ...passthroughSyntaxPlugins,
-          [require('@babel/plugin-transform-unicode-regex')],
-        ],
+        plugins: defaultPlugins,
       },
       {
         test: isTypeScriptSource,

packages/react-native-babel-transformer/package.json

@@ -14,7 +14,7 @@
   ],
   "license": "MIT",
   "engines": {
-    "node": ">= 20.19.4"
+    "node": ">= 22.14.0"
   },
   "main": "src/index.js",
   "files": [

packages/react-native-codegen/e2e/deep_imports/__tests__/components/__snapshots__/GeneratePropsJavaInterface-test.js.snap

@@ -2,7 +2,7 @@
 
 exports[`GeneratePropsJavaInterface can generate for 'ArrayPropsNativeComponent.js' 1`] = `
 Object {
-  "java/com/facebook/react/viewmanagers/ArrayPropsNativeComponentViewManagerInterface.java": "/**
+  "java/com/facebook/react/viewmanagers/ArrayPropsNativeComponentViewManagerInterface.kt": "/**
 * This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
 *
 * Do not edit this file as changes may cause incorrect behavior and will be lost
@@ -11,27 +11,26 @@ Object {
 * @generated by codegen project: GeneratePropsJavaInterface.js
 */
 
-package com.facebook.react.viewmanagers;
+package com.facebook.react.viewmanagers
 
 import android.view.View;
-import androidx.annotation.Nullable;
 import com.facebook.react.bridge.ReadableArray;
 import com.facebook.react.uimanager.ViewManagerWithGeneratedInterface;
 
-public interface ArrayPropsNativeComponentViewManagerInterface<T extends View> extends ViewManagerWithGeneratedInterface {
-  void setNames(T view, @Nullable ReadableArray value);
-  void setDisableds(T view, @Nullable ReadableArray value);
-  void setProgress(T view, @Nullable ReadableArray value);
-  void setRadii(T view, @Nullable ReadableArray value);
-  void setColors(T view, @Nullable ReadableArray value);
-  void setSrcs(T view, @Nullable ReadableArray value);
-  void setPoints(T view, @Nullable ReadableArray value);
-  void setEdgeInsets(T view, @Nullable ReadableArray value);
-  void setDimensions(T view, @Nullable ReadableArray value);
-  void setSizes(T view, @Nullable ReadableArray value);
-  void setObject(T view, @Nullable ReadableArray value);
-  void setArrayOfObjects(T view, @Nullable ReadableArray value);
-  void setArrayOfMixed(T view, @Nullable ReadableArray value);
+public interface ArrayPropsNativeComponentViewManagerInterface<T: View>: ViewManagerWithGeneratedInterface {
+  public fun setNames(view: T, value: ReadableArray?): Unit
+  public fun setDisableds(view: T, value: ReadableArray?): Unit
+  public fun setProgress(view: T, value: ReadableArray?): Unit
+  public fun setRadii(view: T, value: ReadableArray?): Unit
+  public fun setColors(view: T, value: ReadableArray?): Unit
+  public fun setSrcs(view: T, value: ReadableArray?): Unit
+  public fun setPoints(view: T, value: ReadableArray?): Unit
+  public fun setEdgeInsets(view: T, value: ReadableArray?): Unit
+  public fun setDimensions(view: T, value: ReadableArray?): Unit
+  public fun setSizes(view: T, value: ReadableArray?): Unit
+  public fun setObject(view: T, value: ReadableArray?): Unit
+  public fun setArrayOfObjects(view: T, value: ReadableArray?): Unit
+  public fun setArrayOfMixed(view: T, value: ReadableArray?): Unit
 }
 ",
 }
@@ -39,7 +38,7 @@ public interface ArrayPropsNativeComponentViewManagerInterface<T extends View> e
 
 exports[`GeneratePropsJavaInterface can generate for 'BooleanPropNativeComponent.js' 1`] = `
 Object {
-  "java/com/facebook/react/viewmanagers/BooleanPropNativeComponentViewManagerInterface.java": "/**
+  "java/com/facebook/react/viewmanagers/BooleanPropNativeComponentViewManagerInterface.kt": "/**
 * This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
 *
 * Do not edit this file as changes may cause incorrect behavior and will be lost
@@ -48,15 +47,14 @@ Object {
 * @generated by codegen project: GeneratePropsJavaInterface.js
 */
 
-package com.facebook.react.viewmanagers;
+package com.facebook.react.viewmanagers
 
 import android.view.View;
-import androidx.annotation.Nullable;
 import com.facebook.react.uimanager.ViewManagerWithGeneratedInterface;
 
-public interface BooleanPropNativeComponentViewManagerInterface<T extends View> extends ViewManagerWithGeneratedInterface {
-  void setDisabled(T view, boolean value);
-  void setDisabledNullable(T view, @Nullable Boolean value);
+public interface BooleanPropNativeComponentViewManagerInterface<T: View>: ViewManagerWithGeneratedInterface {
+  public fun setDisabled(view: T, value: Boolean): Unit
+  public fun setDisabledNullable(view: T, value: Boolean?): Unit
 }
 ",
 }
@@ -64,7 +62,7 @@ public interface BooleanPropNativeComponentViewManagerInterface<T extends View>
 
 exports[`GeneratePropsJavaInterface can generate for 'ColorPropNativeComponent.js' 1`] = `
 Object {
-  "java/com/facebook/react/viewmanagers/ColorPropNativeComponentViewManagerInterface.java": "/**
+  "java/com/facebook/react/viewmanagers/ColorPropNativeComponentViewManagerInterface.kt": "/**
 * This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
 *
 * Do not edit this file as changes may cause incorrect behavior and will be lost
@@ -73,14 +71,13 @@ Object {
 * @generated by codegen project: GeneratePropsJavaInterface.js
 */
 
-package com.facebook.react.viewmanagers;
+package com.facebook.react.viewmanagers
 
 import android.view.View;
-import androidx.annotation.Nullable;
 import com.facebook.react.uimanager.ViewManagerWithGeneratedInterface;
 
-public interface ColorPropNativeComponentViewManagerInterface<T extends View> extends ViewManagerWithGeneratedInterface {
-  void setTintColor(T view, @Nullable Integer value);
+public interface ColorPropNativeComponentViewManagerInterface<T: View>: ViewManagerWithGeneratedInterface {
+  public fun setTintColor(view: T, value: Int?): Unit
 }
 ",
 }
@@ -88,7 +85,7 @@ public interface ColorPropNativeComponentViewManagerInterface<T extends View> ex
 
 exports[`GeneratePropsJavaInterface can generate for 'DimensionPropNativeComponent.js' 1`] = `
 Object {
-  "java/com/facebook/react/viewmanagers/DimensionPropNativeComponentViewManagerInterface.java": "/**
+  "java/com/facebook/react/viewmanagers/DimensionPropNativeComponentViewManagerInterface.kt": "/**
 * This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
 *
 * Do not edit this file as changes may cause incorrect behavior and will be lost
@@ -97,15 +94,14 @@ Object {
 * @generated by codegen project: GeneratePropsJavaInterface.js
 */
 
-package com.facebook.react.viewmanagers;
+package com.facebook.react.viewmanagers
 
 import android.view.View;
-import androidx.annotation.Nullable;
 import com.facebook.react.uimanager.ViewManagerWithGeneratedInterface;
 import com.facebook.yoga.YogaValue;
 
-public interface DimensionPropNativeComponentViewManagerInterface<T extends View> extends ViewManagerWithGeneratedInterface {
-  void setMarginBack(T view, @Nullable YogaValue value);
+public interface DimensionPropNativeComponentViewManagerInterface<T: View>: ViewManagerWithGeneratedInterface {
+  public fun setMarginBack(view: T, value: YogaValue?): Unit
 }
 ",
 }
@@ -113,7 +109,7 @@ public interface DimensionPropNativeComponentViewManagerInterface<T extends View
 
 exports[`GeneratePropsJavaInterface can generate for 'EdgeInsetsPropNativeComponent.js' 1`] = `
 Object {
-  "java/com/facebook/react/viewmanagers/EdgeInsetsPropNativeComponentViewManagerInterface.java": "/**
+  "java/com/facebook/react/viewmanagers/EdgeInsetsPropNativeComponentViewManagerInterface.kt": "/**
 * This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
 *
 * Do not edit this file as changes may cause incorrect behavior and will be lost
@@ -122,12 +118,12 @@ Object {
 * @generated by codegen project: GeneratePropsJavaInterface.js
 */
 
-package com.facebook.react.viewmanagers;
+package com.facebook.react.viewmanagers
 
 import android.view.View;
 import com.facebook.react.uimanager.ViewManagerWithGeneratedInterface;
 
-public interface EdgeInsetsPropNativeComponentViewManagerInterface<T extends View> extends ViewManagerWithGeneratedInterface {
+public interface EdgeInsetsPropNativeComponentViewManagerInterface<T: View>: ViewManagerWithGeneratedInterface {
   // No props
 }
 ",
@@ -136,7 +132,7 @@ public interface EdgeInsetsPropNativeComponentViewManagerInterface<T extends Vie
 
 exports[`GeneratePropsJavaInterface can generate for 'EnumPropNativeComponent.js' 1`] = `
 Object {
-  "java/com/facebook/react/viewmanagers/EnumPropNativeComponentViewManagerInterface.java": "/**
+  "java/com/facebook/react/viewmanagers/EnumPropNativeComponentViewManagerInterface.kt": "/**
 * This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
 *
 * Do not edit this file as changes may cause incorrect behavior and will be lost
@@ -145,15 +141,14 @@ Object {
 * @generated by codegen project: GeneratePropsJavaInterface.js
 */
 
-package com.facebook.react.viewmanagers;
+package com.facebook.react.viewmanagers
 
 import android.view.View;
-import androidx.annotation.Nullable;
 import com.facebook.react.uimanager.ViewManagerWithGeneratedInterface;
 
-public interface EnumPropNativeComponentViewManagerInterface<T extends View> extends ViewManagerWithGeneratedInterface {
-  void setAlignment(T view, @Nullable String value);
-  void setIntervals(T view, @Nullable Integer value);
+public interface EnumPropNativeComponentViewManagerInterface<T: View>: ViewManagerWithGeneratedInterface {
+  public fun setAlignment(view: T, value: String?): Unit
+  public fun setIntervals(view: T, value: Int?): Unit
 }
 ",
 }
@@ -161,7 +156,7 @@ public interface EnumPropNativeComponentViewManagerInterface<T extends View> ext
 
 exports[`GeneratePropsJavaInterface can generate for 'EventNestedObjectPropsNativeComponent.js' 1`] = `
 Object {
-  "java/com/facebook/react/viewmanagers/EventNestedObjectPropsNativeComponentViewManagerInterface.java": "/**
+  "java/com/facebook/react/viewmanagers/EventNestedObjectPropsNativeComponentViewManagerInterface.kt": "/**
 * This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
 *
 * Do not edit this file as changes may cause incorrect behavior and will be lost
@@ -170,13 +165,13 @@ Object {
 * @generated by codegen project: GeneratePropsJavaInterface.js
 */
 
-package com.facebook.react.viewmanagers;
+package com.facebook.react.viewmanagers
 
 import android.view.View;
 import com.facebook.react.uimanager.ViewManagerWithGeneratedInterface;
 
-public interface EventNestedObjectPropsNativeComponentViewManagerInterface<T extends View> extends ViewManagerWithGeneratedInterface {
-  void setDisabled(T view, boolean value);
+public interface EventNestedObjectPropsNativeComponentViewManagerInterface<T: View>: ViewManagerWithGeneratedInterface {
+  public fun setDisabled(view: T, value: Boolean): Unit
 }
 ",
 }
@@ -184,7 +179,7 @@ public interface EventNestedObjectPropsNativeComponentViewManagerInterface<T ext
 
 exports[`GeneratePropsJavaInterface can generate for 'EventPropsNativeComponent.js' 1`] = `
 Object {
-  "java/com/facebook/react/viewmanagers/EventPropsNativeComponentViewManagerInterface.java": "/**
+  "java/com/facebook/react/viewmanagers/EventPropsNativeComponentViewManagerInterface.kt": "/**
 * This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
 *
 * Do not edit this file as changes may cause incorrect behavior and will be lost
@@ -193,13 +188,13 @@ Object {
 * @generated by codegen project: GeneratePropsJavaInterface.js
 */
 
-package com.facebook.react.viewmanagers;
+package com.facebook.react.viewmanagers
 
 import android.view.View;
 import com.facebook.react.uimanager.ViewManagerWithGeneratedInterface;
 
-public interface EventPropsNativeComponentViewManagerInterface<T extends View> extends ViewManagerWithGeneratedInterface {
-  void setDisabled(T view, boolean value);
+public interface EventPropsNativeComponentViewManagerInterface<T: View>: ViewManagerWithGeneratedInterface {
+  public fun setDisabled(view: T, value: Boolean): Unit
 }
 ",
 }
@@ -207,7 +202,7 @@ public interface EventPropsNativeComponentViewManagerInterface<T extends View> e
 
 exports[`GeneratePropsJavaInterface can generate for 'FloatPropsNativeComponent.js' 1`] = `
 Object {
-  "java/com/facebook/react/viewmanagers/FloatPropsNativeComponentViewManagerInterface.java": "/**
+  "java/com/facebook/react/viewmanagers/FloatPropsNativeComponentViewManagerInterface.kt": "/**
 * This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
 *
 * Do not edit this file as changes may cause incorrect behavior and will be lost
@@ -216,20 +211,19 @@ Object {
 * @generated by codegen project: GeneratePropsJavaInterface.js
 */
 
-package com.facebook.react.viewmanagers;
+package com.facebook.react.viewmanagers
 
 import android.view.View;
-import androidx.annotation.Nullable;
 import com.facebook.react.uimanager.ViewManagerWithGeneratedInterface;
 
-public interface FloatPropsNativeComponentViewManagerInterface<T extends View> extends ViewManagerWithGeneratedInterface {
-  void setBlurRadius(T view, float value);
-  void setBlurRadius2(T view, float value);
-  void setBlurRadius3(T view, float value);
-  void setBlurRadius4(T view, float value);
-  void setBlurRadius5(T view, float value);
-  void setBlurRadius6(T view, float value);
-  void setBlurRadiusNullable(T view, @Nullable Float value);
+public interface FloatPropsNativeComponentViewManagerInterface<T: View>: ViewManagerWithGeneratedInterface {
+  public fun setBlurRadius(view: T, value: Float): Unit
+  public fun setBlurRadius2(view: T, value: Float): Unit
+  public fun setBlurRadius3(view: T, value: Float): Unit
+  public fun setBlurRadius4(view: T, value: Float): Unit
+  public fun setBlurRadius5(view: T, value: Float): Unit
+  public fun setBlurRadius6(view: T, value: Float): Unit
+  public fun setBlurRadiusNullable(view: T, value: Float?): Unit
 }
 ",
 }
@@ -237,7 +231,7 @@ public interface FloatPropsNativeComponentViewManagerInterface<T extends View> e
 
 exports[`GeneratePropsJavaInterface can generate for 'ImagePropNativeComponent.js' 1`] = `
 Object {
-  "java/com/facebook/react/viewmanagers/ImagePropNativeComponentViewManagerInterface.java": "/**
+  "java/com/facebook/react/viewmanagers/ImagePropNativeComponentViewManagerInterface.kt": "/**
 * This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
 *
 * Do not edit this file as changes may cause incorrect behavior and will be lost
@@ -246,15 +240,14 @@ Object {
 * @generated by codegen project: GeneratePropsJavaInterface.js
 */
 
-package com.facebook.react.viewmanagers;
+package com.facebook.react.viewmanagers
 
 import android.view.View;
-import androidx.annotation.Nullable;
 import com.facebook.react.bridge.ReadableMap;
 import com.facebook.react.uimanager.ViewManagerWithGeneratedInterface;
 
-public interface ImagePropNativeComponentViewManagerInterface<T extends View> extends ViewManagerWithGeneratedInterface {
-  void setThumbImage(T view, @Nullable ReadableMap value);
+public interface ImagePropNativeComponentViewManagerInterface<T: View>: ViewManagerWithGeneratedInterface {
+  public fun setThumbImage(view: T, value: ReadableMap?): Unit
 }
 ",
 }
@@ -262,7 +255,7 @@ public interface ImagePropNativeComponentViewManagerInterface<T extends View> ex
 
 exports[`GeneratePropsJavaInterface can generate for 'IntegerPropNativeComponent.js' 1`] = `
 Object {
-  "java/com/facebook/react/viewmanagers/IntegerPropNativeComponentViewManagerInterface.java": "/**
+  "java/com/facebook/react/viewmanagers/IntegerPropNativeComponentViewManagerInterface.kt": "/**
 * This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
 *
 * Do not edit this file as changes may cause incorrect behavior and will be lost
@@ -271,15 +264,15 @@ Object {
 * @generated by codegen project: GeneratePropsJavaInterface.js
 */
 
-package com.facebook.react.viewmanagers;
+package com.facebook.react.viewmanagers
 
 import android.view.View;
 import com.facebook.react.uimanager.ViewManagerWithGeneratedInterface;
 
-public interface IntegerPropNativeComponentViewManagerInterface<T extends View> extends ViewManagerWithGeneratedInterface {
-  void setProgress1(T view, int value);
-  void setProgress2(T view, int value);
-  void setProgress3(T view, int value);
+public interface IntegerPropNativeComponentViewManagerInterface<T: View>: ViewManagerWithGeneratedInterface {
+  public fun setProgress1(view: T, value: Int): Unit
+  public fun setProgress2(view: T, value: Int): Unit
+  public fun setProgress3(view: T, value: Int): Unit
 }
 ",
 }
@@ -287,7 +280,7 @@ public interface IntegerPropNativeComponentViewManagerInterface<T extends View>
 
 exports[`GeneratePropsJavaInterface can generate for 'InterfaceOnlyNativeComponent.js' 1`] = `
 Object {
-  "java/com/facebook/react/viewmanagers/InterfaceOnlyNativeComponentViewManagerInterface.java": "/**
+  "java/com/facebook/react/viewmanagers/InterfaceOnlyNativeComponentViewManagerInterface.kt": "/**
 * This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
 *
 * Do not edit this file as changes may cause incorrect behavior and will be lost
@@ -296,14 +289,13 @@ Object {
 * @generated by codegen project: GeneratePropsJavaInterface.js
 */
 
-package com.facebook.react.viewmanagers;
+package com.facebook.react.viewmanagers
 
 import android.view.View;
-import androidx.annotation.Nullable;
 import com.facebook.react.uimanager.ViewManagerWithGeneratedInterface;
 
-public interface InterfaceOnlyNativeComponentViewManagerInterface<T extends View> extends ViewManagerWithGeneratedInterface {
-  void setTitle(T view, @Nullable String value);
+public interface InterfaceOnlyNativeComponentViewManagerInterface<T: View>: ViewManagerWithGeneratedInterface {
+  public fun setTitle(view: T, value: String?): Unit
 }
 ",
 }
@@ -311,7 +303,7 @@ public interface InterfaceOnlyNativeComponentViewManagerInterface<T extends View
 
 exports[`GeneratePropsJavaInterface can generate for 'MixedPropNativeComponent.js' 1`] = `
 Object {
-  "java/com/facebook/react/viewmanagers/MixedPropNativeComponentViewManagerInterface.java": "/**
+  "java/com/facebook/react/viewmanagers/MixedPropNativeComponentViewManagerInterface.kt": "/**
 * This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
 *
 * Do not edit this file as changes may cause incorrect behavior and will be lost
@@ -320,14 +312,14 @@ Object {
 * @generated by codegen project: GeneratePropsJavaInterface.js
 */
 
-package com.facebook.react.viewmanagers;
+package com.facebook.react.viewmanagers
 
 import android.view.View;
 import com.facebook.react.bridge.Dynamic;
 import com.facebook.react.uimanager.ViewManagerWithGeneratedInterface;
 
-public interface MixedPropNativeComponentViewManagerInterface<T extends View> extends ViewManagerWithGeneratedInterface {
-  void setMixedProp(T view, Dynamic value);
+public interface MixedPropNativeComponentViewManagerInterface<T: View>: ViewManagerWithGeneratedInterface {
+  public fun setMixedProp(view: T, value: Dynamic): Unit
 }
 ",
 }
@@ -335,7 +327,7 @@ public interface MixedPropNativeComponentViewManagerInterface<T extends View> ex
 
 exports[`GeneratePropsJavaInterface can generate for 'MultiNativePropNativeComponent.js' 1`] = `
 Object {
-  "java/com/facebook/react/viewmanagers/MultiNativePropNativeComponentViewManagerInterface.java": "/**
+  "java/com/facebook/react/viewmanagers/MultiNativePropNativeComponentViewManagerInterface.kt": "/**
 * This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
 *
 * Do not edit this file as changes may cause incorrect behavior and will be lost
@@ -344,18 +336,17 @@ Object {
 * @generated by codegen project: GeneratePropsJavaInterface.js
 */
 
-package com.facebook.react.viewmanagers;
+package com.facebook.react.viewmanagers
 
 import android.view.View;
-import androidx.annotation.Nullable;
 import com.facebook.react.bridge.ReadableMap;
 import com.facebook.react.uimanager.ViewManagerWithGeneratedInterface;
 
-public interface MultiNativePropNativeComponentViewManagerInterface<T extends View> extends ViewManagerWithGeneratedInterface {
-  void setThumbImage(T view, @Nullable ReadableMap value);
-  void setColor(T view, @Nullable Integer value);
-  void setThumbTintColor(T view, @Nullable Integer value);
-  void setPoint(T view, @Nullable ReadableMap value);
+public interface MultiNativePropNativeComponentViewManagerInterface<T: View>: ViewManagerWithGeneratedInterface {
+  public fun setThumbImage(view: T, value: ReadableMap?): Unit
+  public fun setColor(view: T, value: Int?): Unit
+  public fun setThumbTintColor(view: T, value: Int?): Unit
+  public fun setPoint(view: T, value: ReadableMap?): Unit
 }
 ",
 }
@@ -363,7 +354,7 @@ public interface MultiNativePropNativeComponentViewManagerInterface<T extends Vi
 
 exports[`GeneratePropsJavaInterface can generate for 'NoPropsNoEventsNativeComponent.js' 1`] = `
 Object {
-  "java/com/facebook/react/viewmanagers/NoPropsNoEventsNativeComponentViewManagerInterface.java": "/**
+  "java/com/facebook/react/viewmanagers/NoPropsNoEventsNativeComponentViewManagerInterface.kt": "/**
 * This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
 *
 * Do not edit this file as changes may cause incorrect behavior and will be lost
@@ -372,12 +363,12 @@ Object {
 * @generated by codegen project: GeneratePropsJavaInterface.js
 */
 
-package com.facebook.react.viewmanagers;
+package com.facebook.react.viewmanagers
 
 import android.view.View;
 import com.facebook.react.uimanager.ViewManagerWithGeneratedInterface;
 
-public interface NoPropsNoEventsNativeComponentViewManagerInterface<T extends View> extends ViewManagerWithGeneratedInterface {
+public interface NoPropsNoEventsNativeComponentViewManagerInterface<T: View>: ViewManagerWithGeneratedInterface {
   // No props
 }
 ",
@@ -386,7 +377,7 @@ public interface NoPropsNoEventsNativeComponentViewManagerInterface<T extends Vi
 
 exports[`GeneratePropsJavaInterface can generate for 'ObjectPropsNativeComponent.js' 1`] = `
 Object {
-  "java/com/facebook/react/viewmanagers/ObjectPropsNativeComponentManagerInterface.java": "/**
+  "java/com/facebook/react/viewmanagers/ObjectPropsNativeComponentManagerInterface.kt": "/**
 * This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
 *
 * Do not edit this file as changes may cause incorrect behavior and will be lost
@@ -395,17 +386,16 @@ Object {
 * @generated by codegen project: GeneratePropsJavaInterface.js
 */
 
-package com.facebook.react.viewmanagers;
+package com.facebook.react.viewmanagers
 
 import android.view.View;
-import androidx.annotation.Nullable;
 import com.facebook.react.bridge.ReadableMap;
 import com.facebook.react.uimanager.ViewManagerWithGeneratedInterface;
 
-public interface ObjectPropsNativeComponentManagerInterface<T extends View> extends ViewManagerWithGeneratedInterface {
-  void setObjectProp(T view, @Nullable ReadableMap value);
-  void setObjectArrayProp(T view, @Nullable ReadableMap value);
-  void setObjectPrimitiveRequiredProp(T view, @Nullable ReadableMap value);
+public interface ObjectPropsNativeComponentManagerInterface<T: View>: ViewManagerWithGeneratedInterface {
+  public fun setObjectProp(view: T, value: ReadableMap?): Unit
+  public fun setObjectArrayProp(view: T, value: ReadableMap?): Unit
+  public fun setObjectPrimitiveRequiredProp(view: T, value: ReadableMap?): Unit
 }
 ",
 }
@@ -413,7 +403,7 @@ public interface ObjectPropsNativeComponentManagerInterface<T extends View> exte
 
 exports[`GeneratePropsJavaInterface can generate for 'PointPropNativeComponent.js' 1`] = `
 Object {
-  "java/com/facebook/react/viewmanagers/PointPropNativeComponentViewManagerInterface.java": "/**
+  "java/com/facebook/react/viewmanagers/PointPropNativeComponentViewManagerInterface.kt": "/**
 * This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
 *
 * Do not edit this file as changes may cause incorrect behavior and will be lost
@@ -422,15 +412,14 @@ Object {
 * @generated by codegen project: GeneratePropsJavaInterface.js
 */
 
-package com.facebook.react.viewmanagers;
+package com.facebook.react.viewmanagers
 
 import android.view.View;
-import androidx.annotation.Nullable;
 import com.facebook.react.bridge.ReadableMap;
 import com.facebook.react.uimanager.ViewManagerWithGeneratedInterface;
 
-public interface PointPropNativeComponentViewManagerInterface<T extends View> extends ViewManagerWithGeneratedInterface {
-  void setStartPoint(T view, @Nullable ReadableMap value);
+public interface PointPropNativeComponentViewManagerInterface<T: View>: ViewManagerWithGeneratedInterface {
+  public fun setStartPoint(view: T, value: ReadableMap?): Unit
 }
 ",
 }
@@ -438,7 +427,7 @@ public interface PointPropNativeComponentViewManagerInterface<T extends View> ex
 
 exports[`GeneratePropsJavaInterface can generate for 'StringPropNativeComponent.js' 1`] = `
 Object {
-  "java/com/facebook/react/viewmanagers/StringPropNativeComponentViewManagerInterface.java": "/**
+  "java/com/facebook/react/viewmanagers/StringPropNativeComponentViewManagerInterface.kt": "/**
 * This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
 *
 * Do not edit this file as changes may cause incorrect behavior and will be lost
@@ -447,15 +436,14 @@ Object {
 * @generated by codegen project: GeneratePropsJavaInterface.js
 */
 
-package com.facebook.react.viewmanagers;
+package com.facebook.react.viewmanagers
 
 import android.view.View;
-import androidx.annotation.Nullable;
 import com.facebook.react.uimanager.ViewManagerWithGeneratedInterface;
 
-public interface StringPropNativeComponentViewManagerInterface<T extends View> extends ViewManagerWithGeneratedInterface {
-  void setPlaceholder(T view, @Nullable String value);
-  void setDefaultValue(T view, @Nullable String value);
+public interface StringPropNativeComponentViewManagerInterface<T: View>: ViewManagerWithGeneratedInterface {
+  public fun setPlaceholder(view: T, value: String?): Unit
+  public fun setDefaultValue(view: T, value: String?): Unit
 }
 ",
 }

packages/react-native-codegen/e2e/namespaced/__tests__/components/__snapshots__/GeneratePropsJavaInterface-test.js.snap

@@ -2,7 +2,7 @@
 
 exports[`GeneratePropsJavaInterface can generate for 'ArrayPropsNativeComponent.js' 1`] = `
 Object {
-  "java/com/facebook/react/viewmanagers/ArrayPropsNativeComponentViewManagerInterface.java": "/**
+  "java/com/facebook/react/viewmanagers/ArrayPropsNativeComponentViewManagerInterface.kt": "/**
 * This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
 *
 * Do not edit this file as changes may cause incorrect behavior and will be lost
@@ -11,27 +11,26 @@ Object {
 * @generated by codegen project: GeneratePropsJavaInterface.js
 */
 
-package com.facebook.react.viewmanagers;
+package com.facebook.react.viewmanagers
 
 import android.view.View;
-import androidx.annotation.Nullable;
 import com.facebook.react.bridge.ReadableArray;
 import com.facebook.react.uimanager.ViewManagerWithGeneratedInterface;
 
-public interface ArrayPropsNativeComponentViewManagerInterface<T extends View> extends ViewManagerWithGeneratedInterface {
-  void setNames(T view, @Nullable ReadableArray value);
-  void setDisableds(T view, @Nullable ReadableArray value);
-  void setProgress(T view, @Nullable ReadableArray value);
-  void setRadii(T view, @Nullable ReadableArray value);
-  void setColors(T view, @Nullable ReadableArray value);
-  void setSrcs(T view, @Nullable ReadableArray value);
-  void setPoints(T view, @Nullable ReadableArray value);
-  void setEdgeInsets(T view, @Nullable ReadableArray value);
-  void setDimensions(T view, @Nullable ReadableArray value);
-  void setSizes(T view, @Nullable ReadableArray value);
-  void setObject(T view, @Nullable ReadableArray value);
-  void setArrayOfObjects(T view, @Nullable ReadableArray value);
-  void setArrayOfMixed(T view, @Nullable ReadableArray value);
+public interface ArrayPropsNativeComponentViewManagerInterface<T: View>: ViewManagerWithGeneratedInterface {
+  public fun setNames(view: T, value: ReadableArray?): Unit
+  public fun setDisableds(view: T, value: ReadableArray?): Unit
+  public fun setProgress(view: T, value: ReadableArray?): Unit
+  public fun setRadii(view: T, value: ReadableArray?): Unit
+  public fun setColors(view: T, value: ReadableArray?): Unit
+  public fun setSrcs(view: T, value: ReadableArray?): Unit
+  public fun setPoints(view: T, value: ReadableArray?): Unit
+  public fun setEdgeInsets(view: T, value: ReadableArray?): Unit
+  public fun setDimensions(view: T, value: ReadableArray?): Unit
+  public fun setSizes(view: T, value: ReadableArray?): Unit
+  public fun setObject(view: T, value: ReadableArray?): Unit
+  public fun setArrayOfObjects(view: T, value: ReadableArray?): Unit
+  public fun setArrayOfMixed(view: T, value: ReadableArray?): Unit
 }
 ",
 }
@@ -39,7 +38,7 @@ public interface ArrayPropsNativeComponentViewManagerInterface<T extends View> e
 
 exports[`GeneratePropsJavaInterface can generate for 'BooleanPropNativeComponent.js' 1`] = `
 Object {
-  "java/com/facebook/react/viewmanagers/BooleanPropNativeComponentViewManagerInterface.java": "/**
+  "java/com/facebook/react/viewmanagers/BooleanPropNativeComponentViewManagerInterface.kt": "/**
 * This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
 *
 * Do not edit this file as changes may cause incorrect behavior and will be lost
@@ -48,15 +47,14 @@ Object {
 * @generated by codegen project: GeneratePropsJavaInterface.js
 */
 
-package com.facebook.react.viewmanagers;
+package com.facebook.react.viewmanagers
 
 import android.view.View;
-import androidx.annotation.Nullable;
 import com.facebook.react.uimanager.ViewManagerWithGeneratedInterface;
 
-public interface BooleanPropNativeComponentViewManagerInterface<T extends View> extends ViewManagerWithGeneratedInterface {
-  void setDisabled(T view, boolean value);
-  void setDisabledNullable(T view, @Nullable Boolean value);
+public interface BooleanPropNativeComponentViewManagerInterface<T: View>: ViewManagerWithGeneratedInterface {
+  public fun setDisabled(view: T, value: Boolean): Unit
+  public fun setDisabledNullable(view: T, value: Boolean?): Unit
 }
 ",
 }
@@ -64,7 +62,7 @@ public interface BooleanPropNativeComponentViewManagerInterface<T extends View>
 
 exports[`GeneratePropsJavaInterface can generate for 'ColorPropNativeComponent.js' 1`] = `
 Object {
-  "java/com/facebook/react/viewmanagers/ColorPropNativeComponentViewManagerInterface.java": "/**
+  "java/com/facebook/react/viewmanagers/ColorPropNativeComponentViewManagerInterface.kt": "/**
 * This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
 *
 * Do not edit this file as changes may cause incorrect behavior and will be lost
@@ -73,14 +71,13 @@ Object {
 * @generated by codegen project: GeneratePropsJavaInterface.js
 */
 
-package com.facebook.react.viewmanagers;
+package com.facebook.react.viewmanagers
 
 import android.view.View;
-import androidx.annotation.Nullable;
 import com.facebook.react.uimanager.ViewManagerWithGeneratedInterface;
 
-public interface ColorPropNativeComponentViewManagerInterface<T extends View> extends ViewManagerWithGeneratedInterface {
-  void setTintColor(T view, @Nullable Integer value);
+public interface ColorPropNativeComponentViewManagerInterface<T: View>: ViewManagerWithGeneratedInterface {
+  public fun setTintColor(view: T, value: Int?): Unit
 }
 ",
 }
@@ -88,7 +85,7 @@ public interface ColorPropNativeComponentViewManagerInterface<T extends View> ex
 
 exports[`GeneratePropsJavaInterface can generate for 'DimensionPropNativeComponent.js' 1`] = `
 Object {
-  "java/com/facebook/react/viewmanagers/DimensionPropNativeComponentViewManagerInterface.java": "/**
+  "java/com/facebook/react/viewmanagers/DimensionPropNativeComponentViewManagerInterface.kt": "/**
 * This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
 *
 * Do not edit this file as changes may cause incorrect behavior and will be lost
@@ -97,15 +94,14 @@ Object {
 * @generated by codegen project: GeneratePropsJavaInterface.js
 */
 
-package com.facebook.react.viewmanagers;
+package com.facebook.react.viewmanagers
 
 import android.view.View;
-import androidx.annotation.Nullable;
 import com.facebook.react.uimanager.ViewManagerWithGeneratedInterface;
 import com.facebook.yoga.YogaValue;
 
-public interface DimensionPropNativeComponentViewManagerInterface<T extends View> extends ViewManagerWithGeneratedInterface {
-  void setMarginBack(T view, @Nullable YogaValue value);
+public interface DimensionPropNativeComponentViewManagerInterface<T: View>: ViewManagerWithGeneratedInterface {
+  public fun setMarginBack(view: T, value: YogaValue?): Unit
 }
 ",
 }
@@ -113,7 +109,7 @@ public interface DimensionPropNativeComponentViewManagerInterface<T extends View
 
 exports[`GeneratePropsJavaInterface can generate for 'EdgeInsetsPropNativeComponent.js' 1`] = `
 Object {
-  "java/com/facebook/react/viewmanagers/EdgeInsetsPropNativeComponentViewManagerInterface.java": "/**
+  "java/com/facebook/react/viewmanagers/EdgeInsetsPropNativeComponentViewManagerInterface.kt": "/**
 * This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
 *
 * Do not edit this file as changes may cause incorrect behavior and will be lost
@@ -122,12 +118,12 @@ Object {
 * @generated by codegen project: GeneratePropsJavaInterface.js
 */
 
-package com.facebook.react.viewmanagers;
+package com.facebook.react.viewmanagers
 
 import android.view.View;
 import com.facebook.react.uimanager.ViewManagerWithGeneratedInterface;
 
-public interface EdgeInsetsPropNativeComponentViewManagerInterface<T extends View> extends ViewManagerWithGeneratedInterface {
+public interface EdgeInsetsPropNativeComponentViewManagerInterface<T: View>: ViewManagerWithGeneratedInterface {
   // No props
 }
 ",
@@ -136,7 +132,7 @@ public interface EdgeInsetsPropNativeComponentViewManagerInterface<T extends Vie
 
 exports[`GeneratePropsJavaInterface can generate for 'EnumPropNativeComponent.js' 1`] = `
 Object {
-  "java/com/facebook/react/viewmanagers/EnumPropNativeComponentViewManagerInterface.java": "/**
+  "java/com/facebook/react/viewmanagers/EnumPropNativeComponentViewManagerInterface.kt": "/**
 * This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
 *
 * Do not edit this file as changes may cause incorrect behavior and will be lost
@@ -145,15 +141,14 @@ Object {
 * @generated by codegen project: GeneratePropsJavaInterface.js
 */
 
-package com.facebook.react.viewmanagers;
+package com.facebook.react.viewmanagers
 
 import android.view.View;
-import androidx.annotation.Nullable;
 import com.facebook.react.uimanager.ViewManagerWithGeneratedInterface;
 
-public interface EnumPropNativeComponentViewManagerInterface<T extends View> extends ViewManagerWithGeneratedInterface {
-  void setAlignment(T view, @Nullable String value);
-  void setIntervals(T view, @Nullable Integer value);
+public interface EnumPropNativeComponentViewManagerInterface<T: View>: ViewManagerWithGeneratedInterface {
+  public fun setAlignment(view: T, value: String?): Unit
+  public fun setIntervals(view: T, value: Int?): Unit
 }
 ",
 }
@@ -161,7 +156,7 @@ public interface EnumPropNativeComponentViewManagerInterface<T extends View> ext
 
 exports[`GeneratePropsJavaInterface can generate for 'EventNestedObjectPropsNativeComponent.js' 1`] = `
 Object {
-  "java/com/facebook/react/viewmanagers/EventNestedObjectPropsNativeComponentViewManagerInterface.java": "/**
+  "java/com/facebook/react/viewmanagers/EventNestedObjectPropsNativeComponentViewManagerInterface.kt": "/**
 * This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
 *
 * Do not edit this file as changes may cause incorrect behavior and will be lost
@@ -170,13 +165,13 @@ Object {
 * @generated by codegen project: GeneratePropsJavaInterface.js
 */
 
-package com.facebook.react.viewmanagers;
+package com.facebook.react.viewmanagers
 
 import android.view.View;
 import com.facebook.react.uimanager.ViewManagerWithGeneratedInterface;
 
-public interface EventNestedObjectPropsNativeComponentViewManagerInterface<T extends View> extends ViewManagerWithGeneratedInterface {
-  void setDisabled(T view, boolean value);
+public interface EventNestedObjectPropsNativeComponentViewManagerInterface<T: View>: ViewManagerWithGeneratedInterface {
+  public fun setDisabled(view: T, value: Boolean): Unit
 }
 ",
 }
@@ -184,7 +179,7 @@ public interface EventNestedObjectPropsNativeComponentViewManagerInterface<T ext
 
 exports[`GeneratePropsJavaInterface can generate for 'EventPropsNativeComponent.js' 1`] = `
 Object {
-  "java/com/facebook/react/viewmanagers/EventPropsNativeComponentViewManagerInterface.java": "/**
+  "java/com/facebook/react/viewmanagers/EventPropsNativeComponentViewManagerInterface.kt": "/**
 * This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
 *
 * Do not edit this file as changes may cause incorrect behavior and will be lost
@@ -193,13 +188,13 @@ Object {
 * @generated by codegen project: GeneratePropsJavaInterface.js
 */
 
-package com.facebook.react.viewmanagers;
+package com.facebook.react.viewmanagers
 
 import android.view.View;
 import com.facebook.react.uimanager.ViewManagerWithGeneratedInterface;
 
-public interface EventPropsNativeComponentViewManagerInterface<T extends View> extends ViewManagerWithGeneratedInterface {
-  void setDisabled(T view, boolean value);
+public interface EventPropsNativeComponentViewManagerInterface<T: View>: ViewManagerWithGeneratedInterface {
+  public fun setDisabled(view: T, value: Boolean): Unit
 }
 ",
 }
@@ -207,7 +202,7 @@ public interface EventPropsNativeComponentViewManagerInterface<T extends View> e
 
 exports[`GeneratePropsJavaInterface can generate for 'FloatPropsNativeComponent.js' 1`] = `
 Object {
-  "java/com/facebook/react/viewmanagers/FloatPropsNativeComponentViewManagerInterface.java": "/**
+  "java/com/facebook/react/viewmanagers/FloatPropsNativeComponentViewManagerInterface.kt": "/**
 * This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
 *
 * Do not edit this file as changes may cause incorrect behavior and will be lost
@@ -216,20 +211,19 @@ Object {
 * @generated by codegen project: GeneratePropsJavaInterface.js
 */
 
-package com.facebook.react.viewmanagers;
+package com.facebook.react.viewmanagers
 
 import android.view.View;
-import androidx.annotation.Nullable;
 import com.facebook.react.uimanager.ViewManagerWithGeneratedInterface;
 
-public interface FloatPropsNativeComponentViewManagerInterface<T extends View> extends ViewManagerWithGeneratedInterface {
-  void setBlurRadius(T view, float value);
-  void setBlurRadius2(T view, float value);
-  void setBlurRadius3(T view, float value);
-  void setBlurRadius4(T view, float value);
-  void setBlurRadius5(T view, float value);
-  void setBlurRadius6(T view, float value);
-  void setBlurRadiusNullable(T view, @Nullable Float value);
+public interface FloatPropsNativeComponentViewManagerInterface<T: View>: ViewManagerWithGeneratedInterface {
+  public fun setBlurRadius(view: T, value: Float): Unit
+  public fun setBlurRadius2(view: T, value: Float): Unit
+  public fun setBlurRadius3(view: T, value: Float): Unit
+  public fun setBlurRadius4(view: T, value: Float): Unit
+  public fun setBlurRadius5(view: T, value: Float): Unit
+  public fun setBlurRadius6(view: T, value: Float): Unit
+  public fun setBlurRadiusNullable(view: T, value: Float?): Unit
 }
 ",
 }
@@ -237,7 +231,7 @@ public interface FloatPropsNativeComponentViewManagerInterface<T extends View> e
 
 exports[`GeneratePropsJavaInterface can generate for 'ImagePropNativeComponent.js' 1`] = `
 Object {
-  "java/com/facebook/react/viewmanagers/ImagePropNativeComponentViewManagerInterface.java": "/**
+  "java/com/facebook/react/viewmanagers/ImagePropNativeComponentViewManagerInterface.kt": "/**
 * This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
 *
 * Do not edit this file as changes may cause incorrect behavior and will be lost
@@ -246,15 +240,14 @@ Object {
 * @generated by codegen project: GeneratePropsJavaInterface.js
 */
 
-package com.facebook.react.viewmanagers;
+package com.facebook.react.viewmanagers
 
 import android.view.View;
-import androidx.annotation.Nullable;
 import com.facebook.react.bridge.ReadableMap;
 import com.facebook.react.uimanager.ViewManagerWithGeneratedInterface;
 
-public interface ImagePropNativeComponentViewManagerInterface<T extends View> extends ViewManagerWithGeneratedInterface {
-  void setThumbImage(T view, @Nullable ReadableMap value);
+public interface ImagePropNativeComponentViewManagerInterface<T: View>: ViewManagerWithGeneratedInterface {
+  public fun setThumbImage(view: T, value: ReadableMap?): Unit
 }
 ",
 }
@@ -262,7 +255,7 @@ public interface ImagePropNativeComponentViewManagerInterface<T extends View> ex
 
 exports[`GeneratePropsJavaInterface can generate for 'IntegerPropNativeComponent.js' 1`] = `
 Object {
-  "java/com/facebook/react/viewmanagers/IntegerPropNativeComponentViewManagerInterface.java": "/**
+  "java/com/facebook/react/viewmanagers/IntegerPropNativeComponentViewManagerInterface.kt": "/**
 * This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
 *
 * Do not edit this file as changes may cause incorrect behavior and will be lost
@@ -271,15 +264,15 @@ Object {
 * @generated by codegen project: GeneratePropsJavaInterface.js
 */
 
-package com.facebook.react.viewmanagers;
+package com.facebook.react.viewmanagers
 
 import android.view.View;
 import com.facebook.react.uimanager.ViewManagerWithGeneratedInterface;
 
-public interface IntegerPropNativeComponentViewManagerInterface<T extends View> extends ViewManagerWithGeneratedInterface {
-  void setProgress1(T view, int value);
-  void setProgress2(T view, int value);
-  void setProgress3(T view, int value);
+public interface IntegerPropNativeComponentViewManagerInterface<T: View>: ViewManagerWithGeneratedInterface {
+  public fun setProgress1(view: T, value: Int): Unit
+  public fun setProgress2(view: T, value: Int): Unit
+  public fun setProgress3(view: T, value: Int): Unit
 }
 ",
 }
@@ -287,7 +280,7 @@ public interface IntegerPropNativeComponentViewManagerInterface<T extends View>
 
 exports[`GeneratePropsJavaInterface can generate for 'InterfaceOnlyNativeComponent.js' 1`] = `
 Object {
-  "java/com/facebook/react/viewmanagers/InterfaceOnlyNativeComponentViewManagerInterface.java": "/**
+  "java/com/facebook/react/viewmanagers/InterfaceOnlyNativeComponentViewManagerInterface.kt": "/**
 * This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
 *
 * Do not edit this file as changes may cause incorrect behavior and will be lost
@@ -296,14 +289,13 @@ Object {
 * @generated by codegen project: GeneratePropsJavaInterface.js
 */
 
-package com.facebook.react.viewmanagers;
+package com.facebook.react.viewmanagers
 
 import android.view.View;
-import androidx.annotation.Nullable;
 import com.facebook.react.uimanager.ViewManagerWithGeneratedInterface;
 
-public interface InterfaceOnlyNativeComponentViewManagerInterface<T extends View> extends ViewManagerWithGeneratedInterface {
-  void setTitle(T view, @Nullable String value);
+public interface InterfaceOnlyNativeComponentViewManagerInterface<T: View>: ViewManagerWithGeneratedInterface {
+  public fun setTitle(view: T, value: String?): Unit
 }
 ",
 }
@@ -311,7 +303,7 @@ public interface InterfaceOnlyNativeComponentViewManagerInterface<T extends View
 
 exports[`GeneratePropsJavaInterface can generate for 'MixedPropNativeComponent.js' 1`] = `
 Object {
-  "java/com/facebook/react/viewmanagers/MixedPropNativeComponentViewManagerInterface.java": "/**
+  "java/com/facebook/react/viewmanagers/MixedPropNativeComponentViewManagerInterface.kt": "/**
 * This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
 *
 * Do not edit this file as changes may cause incorrect behavior and will be lost
@@ -320,14 +312,14 @@ Object {
 * @generated by codegen project: GeneratePropsJavaInterface.js
 */
 
-package com.facebook.react.viewmanagers;
+package com.facebook.react.viewmanagers
 
 import android.view.View;
 import com.facebook.react.bridge.Dynamic;
 import com.facebook.react.uimanager.ViewManagerWithGeneratedInterface;
 
-public interface MixedPropNativeComponentViewManagerInterface<T extends View> extends ViewManagerWithGeneratedInterface {
-  void setMixedProp(T view, Dynamic value);
+public interface MixedPropNativeComponentViewManagerInterface<T: View>: ViewManagerWithGeneratedInterface {
+  public fun setMixedProp(view: T, value: Dynamic): Unit
 }
 ",
 }
@@ -335,7 +327,7 @@ public interface MixedPropNativeComponentViewManagerInterface<T extends View> ex
 
 exports[`GeneratePropsJavaInterface can generate for 'MultiNativePropNativeComponent.js' 1`] = `
 Object {
-  "java/com/facebook/react/viewmanagers/MultiNativePropNativeComponentViewManagerInterface.java": "/**
+  "java/com/facebook/react/viewmanagers/MultiNativePropNativeComponentViewManagerInterface.kt": "/**
 * This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
 *
 * Do not edit this file as changes may cause incorrect behavior and will be lost
@@ -344,18 +336,17 @@ Object {
 * @generated by codegen project: GeneratePropsJavaInterface.js
 */
 
-package com.facebook.react.viewmanagers;
+package com.facebook.react.viewmanagers
 
 import android.view.View;
-import androidx.annotation.Nullable;
 import com.facebook.react.bridge.ReadableMap;
 import com.facebook.react.uimanager.ViewManagerWithGeneratedInterface;
 
-public interface MultiNativePropNativeComponentViewManagerInterface<T extends View> extends ViewManagerWithGeneratedInterface {
-  void setThumbImage(T view, @Nullable ReadableMap value);
-  void setColor(T view, @Nullable Integer value);
-  void setThumbTintColor(T view, @Nullable Integer value);
-  void setPoint(T view, @Nullable ReadableMap value);
+public interface MultiNativePropNativeComponentViewManagerInterface<T: View>: ViewManagerWithGeneratedInterface {
+  public fun setThumbImage(view: T, value: ReadableMap?): Unit
+  public fun setColor(view: T, value: Int?): Unit
+  public fun setThumbTintColor(view: T, value: Int?): Unit
+  public fun setPoint(view: T, value: ReadableMap?): Unit
 }
 ",
 }
@@ -363,7 +354,7 @@ public interface MultiNativePropNativeComponentViewManagerInterface<T extends Vi
 
 exports[`GeneratePropsJavaInterface can generate for 'NoPropsNoEventsNativeComponent.js' 1`] = `
 Object {
-  "java/com/facebook/react/viewmanagers/NoPropsNoEventsNativeComponentViewManagerInterface.java": "/**
+  "java/com/facebook/react/viewmanagers/NoPropsNoEventsNativeComponentViewManagerInterface.kt": "/**
 * This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
 *
 * Do not edit this file as changes may cause incorrect behavior and will be lost
@@ -372,12 +363,12 @@ Object {
 * @generated by codegen project: GeneratePropsJavaInterface.js
 */
 
-package com.facebook.react.viewmanagers;
+package com.facebook.react.viewmanagers
 
 import android.view.View;
 import com.facebook.react.uimanager.ViewManagerWithGeneratedInterface;
 
-public interface NoPropsNoEventsNativeComponentViewManagerInterface<T extends View> extends ViewManagerWithGeneratedInterface {
+public interface NoPropsNoEventsNativeComponentViewManagerInterface<T: View>: ViewManagerWithGeneratedInterface {
   // No props
 }
 ",
@@ -386,7 +377,7 @@ public interface NoPropsNoEventsNativeComponentViewManagerInterface<T extends Vi
 
 exports[`GeneratePropsJavaInterface can generate for 'ObjectPropsNativeComponent.js' 1`] = `
 Object {
-  "java/com/facebook/react/viewmanagers/ObjectPropsNativeComponentManagerInterface.java": "/**
+  "java/com/facebook/react/viewmanagers/ObjectPropsNativeComponentManagerInterface.kt": "/**
 * This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
 *
 * Do not edit this file as changes may cause incorrect behavior and will be lost
@@ -395,17 +386,16 @@ Object {
 * @generated by codegen project: GeneratePropsJavaInterface.js
 */
 
-package com.facebook.react.viewmanagers;
+package com.facebook.react.viewmanagers
 
 import android.view.View;
-import androidx.annotation.Nullable;
 import com.facebook.react.bridge.ReadableMap;
 import com.facebook.react.uimanager.ViewManagerWithGeneratedInterface;
 
-public interface ObjectPropsNativeComponentManagerInterface<T extends View> extends ViewManagerWithGeneratedInterface {
-  void setObjectProp(T view, @Nullable ReadableMap value);
-  void setObjectArrayProp(T view, @Nullable ReadableMap value);
-  void setObjectPrimitiveRequiredProp(T view, @Nullable ReadableMap value);
+public interface ObjectPropsNativeComponentManagerInterface<T: View>: ViewManagerWithGeneratedInterface {
+  public fun setObjectProp(view: T, value: ReadableMap?): Unit
+  public fun setObjectArrayProp(view: T, value: ReadableMap?): Unit
+  public fun setObjectPrimitiveRequiredProp(view: T, value: ReadableMap?): Unit
 }
 ",
 }
@@ -413,7 +403,7 @@ public interface ObjectPropsNativeComponentManagerInterface<T extends View> exte
 
 exports[`GeneratePropsJavaInterface can generate for 'PointPropNativeComponent.js' 1`] = `
 Object {
-  "java/com/facebook/react/viewmanagers/PointPropNativeComponentViewManagerInterface.java": "/**
+  "java/com/facebook/react/viewmanagers/PointPropNativeComponentViewManagerInterface.kt": "/**
 * This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
 *
 * Do not edit this file as changes may cause incorrect behavior and will be lost
@@ -422,15 +412,14 @@ Object {
 * @generated by codegen project: GeneratePropsJavaInterface.js
 */
 
-package com.facebook.react.viewmanagers;
+package com.facebook.react.viewmanagers
 
 import android.view.View;
-import androidx.annotation.Nullable;
 import com.facebook.react.bridge.ReadableMap;
 import com.facebook.react.uimanager.ViewManagerWithGeneratedInterface;
 
-public interface PointPropNativeComponentViewManagerInterface<T extends View> extends ViewManagerWithGeneratedInterface {
-  void setStartPoint(T view, @Nullable ReadableMap value);
+public interface PointPropNativeComponentViewManagerInterface<T: View>: ViewManagerWithGeneratedInterface {
+  public fun setStartPoint(view: T, value: ReadableMap?): Unit
 }
 ",
 }
@@ -438,7 +427,7 @@ public interface PointPropNativeComponentViewManagerInterface<T extends View> ex
 
 exports[`GeneratePropsJavaInterface can generate for 'StringPropNativeComponent.js' 1`] = `
 Object {
-  "java/com/facebook/react/viewmanagers/StringPropNativeComponentViewManagerInterface.java": "/**
+  "java/com/facebook/react/viewmanagers/StringPropNativeComponentViewManagerInterface.kt": "/**
 * This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
 *
 * Do not edit this file as changes may cause incorrect behavior and will be lost
@@ -447,15 +436,14 @@ Object {
 * @generated by codegen project: GeneratePropsJavaInterface.js
 */
 
-package com.facebook.react.viewmanagers;
+package com.facebook.react.viewmanagers
 
 import android.view.View;
-import androidx.annotation.Nullable;
 import com.facebook.react.uimanager.ViewManagerWithGeneratedInterface;
 
-public interface StringPropNativeComponentViewManagerInterface<T extends View> extends ViewManagerWithGeneratedInterface {
-  void setPlaceholder(T view, @Nullable String value);
-  void setDefaultValue(T view, @Nullable String value);
+public interface StringPropNativeComponentViewManagerInterface<T: View>: ViewManagerWithGeneratedInterface {
+  public fun setPlaceholder(view: T, value: String?): Unit
+  public fun setDefaultValue(view: T, value: String?): Unit
 }
 ",
 }

packages/react-native-codegen/package.json

@@ -18,7 +18,7 @@
   ],
   "bugs": "https://github.com/facebook/react-native/issues",
   "engines": {
-    "node": ">= 20.19.4"
+    "node": ">= 22.14.0"
   },
   "scripts": {
     "build": "yarn clean && node scripts/build.js --verbose",

packages/react-native-codegen/src/cli/combine/combine-schemas-cli.js

@@ -51,13 +51,12 @@ if (!schemaQuery.startsWith('@')) {
 const schemaQueryOutputFile = schemaQuery.replace(/^@/, '');
 const schemaQueryOutput = fs.readFileSync(schemaQueryOutputFile, 'utf8');
 
+const schemaFiles = schemaQueryOutput.split(' ');
 const modules: {
   [hasteModuleName: string]: NativeModuleSchema | ComponentSchema,
 } = {};
 const specNameToFile: {[hasteModuleName: string]: string} = {};
 
-const schemaFiles =
-  schemaQueryOutput.length > 0 ? schemaQueryOutput.split(' ') : [];
 for (const file of schemaFiles) {
   const schema: SchemaType = JSON.parse(fs.readFileSync(file, 'utf8'));
 

packages/react-native-codegen/src/generators/components/GeneratePropsJavaInterface.js

@@ -48,19 +48,15 @@ const FileTemplate = ({
 * ${'@'}generated by codegen project: GeneratePropsJavaInterface.js
 */
 
-package ${packageName};
+package ${packageName}
 
 ${imports}
 
-public interface ${className}<T extends ${extendClasses}> extends ViewManagerWithGeneratedInterface {
+public interface ${className}<T: ${extendClasses}>: ViewManagerWithGeneratedInterface {
   ${methods}
 }
 `;
 
-function addNullable(imports: Set<string>) {
-  imports.add('import androidx.annotation.Nullable;');
-}
-
 function getJavaValueForProp(
   prop: NamedShape<PropTypeAnnotation>,
   imports: Set<string>,
@@ -70,65 +66,52 @@ function getJavaValueForProp(
   switch (typeAnnotation.type) {
     case 'BooleanTypeAnnotation':
       if (typeAnnotation.default === null) {
-        addNullable(imports);
-        return '@Nullable Boolean value';
+        return 'value: Boolean?';
       } else {
-        return 'boolean value';
+        return 'value: Boolean';
       }
     case 'StringTypeAnnotation':
-      addNullable(imports);
-      return '@Nullable String value';
+      return 'value: String?';
     case 'Int32TypeAnnotation':
-      return 'int value';
+      return 'value: Int';
     case 'DoubleTypeAnnotation':
-      return 'double value';
+      return 'value: Double';
     case 'FloatTypeAnnotation':
       if (typeAnnotation.default === null) {
-        addNullable(imports);
-        return '@Nullable Float value';
+        return 'value: Float?';
       } else {
-        return 'float value';
+        return 'value: Float';
       }
     case 'ReservedPropTypeAnnotation':
       switch (typeAnnotation.name) {
         case 'ColorPrimitive':
-          addNullable(imports);
-          return '@Nullable Integer value';
+          return 'value: Int?';
         case 'ImageSourcePrimitive':
-          addNullable(imports);
-          return '@Nullable ReadableMap value';
+          return 'value: ReadableMap?';
         case 'ImageRequestPrimitive':
-          addNullable(imports);
-          return '@Nullable ReadableMap value';
+          return 'value: ReadableMap?';
         case 'PointPrimitive':
-          addNullable(imports);
-          return '@Nullable ReadableMap value';
+          return 'value: ReadableMap?';
         case 'EdgeInsetsPrimitive':
-          addNullable(imports);
-          return '@Nullable ReadableMap value';
+          return 'value: ReadableMap?';
         case 'DimensionPrimitive':
-          addNullable(imports);
-          return '@Nullable YogaValue value';
+          return 'value: YogaValue?';
         default:
           (typeAnnotation.name: empty);
           throw new Error('Received unknown ReservedPropTypeAnnotation');
       }
     case 'ArrayTypeAnnotation': {
-      addNullable(imports);
-      return '@Nullable ReadableArray value';
+      return 'value: ReadableArray?';
     }
     case 'ObjectTypeAnnotation': {
-      addNullable(imports);
-      return '@Nullable ReadableMap value';
+      return 'value: ReadableMap?';
     }
     case 'StringEnumTypeAnnotation':
-      addNullable(imports);
-      return '@Nullable String value';
+      return 'value: String?';
     case 'Int32EnumTypeAnnotation':
-      addNullable(imports);
-      return '@Nullable Integer value';
+      return 'value: Int?';
     case 'MixedTypeAnnotation':
-      return 'Dynamic value';
+      return 'value: Dynamic';
     default:
       (typeAnnotation: empty);
       throw new Error('Received invalid typeAnnotation');
@@ -142,9 +125,9 @@ function generatePropsString(component: ComponentShape, imports: Set<string>) {
 
   return component.props
     .map(prop => {
-      return `void set${toSafeJavaString(
+      return `public fun set${toSafeJavaString(
         prop.name,
-      )}(T view, ${getJavaValueForProp(prop, imports)});`;
+      )}(view: T, ${getJavaValueForProp(prop, imports)}): Unit`;
     })
     .join('\n' + '  ');
 }
@@ -156,19 +139,19 @@ function getCommandArgJavaType(param: NamedShape<CommandParamTypeAnnotation>) {
     case 'ReservedTypeAnnotation':
       switch (typeAnnotation.name) {
         case 'RootTag':
-          return 'double';
+          return 'Double';
         default:
           (typeAnnotation.name: empty);
           throw new Error(`Receieved invalid type: ${typeAnnotation.name}`);
       }
     case 'BooleanTypeAnnotation':
-      return 'boolean';
+      return 'Boolean';
     case 'DoubleTypeAnnotation':
-      return 'double';
+      return 'Double';
     case 'FloatTypeAnnotation':
-      return 'float';
+      return 'Float';
     case 'Int32TypeAnnotation':
-      return 'int';
+      return 'Int';
     case 'StringTypeAnnotation':
       return 'String';
     case 'ArrayTypeAnnotation':
@@ -184,11 +167,11 @@ function getCommandArguments(
   componentName: string,
 ): string {
   return [
-    'T view',
+    'view: T',
     ...command.typeAnnotation.params.map(param => {
       const commandArgJavaType = getCommandArgJavaType(param);
 
-      return `${commandArgJavaType} ${param.name}`;
+      return `${param.name}: ${commandArgJavaType}`;
     }),
   ].join(', ');
 }
@@ -201,10 +184,10 @@ function generateCommandsString(
     .map(command => {
       const safeJavaName = toSafeJavaString(command.name, false);
 
-      return `void ${safeJavaName}(${getCommandArguments(
+      return `public fun ${safeJavaName}(${getCommandArguments(
         command,
         componentName,
-      )});`;
+      )}): Unit`;
     })
     .join('\n' + '  ');
 }
@@ -287,7 +270,7 @@ module.exports = {
               .trimRight(),
           });
 
-          files.set(`${outputDir}/${className}.java`, replacedTemplate);
+          files.set(`${outputDir}/${className}.kt`, replacedTemplate);
         });
     });
 

packages/react-native-codegen/src/generators/components/GenerateTests.js

@@ -65,15 +65,15 @@ const TestTemplate = ({
   propValue: string,
 }) => `
 TEST(${componentName}_${testName}, etc) {
-  RawPropsParser propParser{};
+  auto propParser = RawPropsParser();
   propParser.prepare<${componentName}>();
-  ${componentName} sourceProps{};
-  RawProps rawProps(folly::dynamic::object("${propName}", ${propValue}));
+  auto const &sourceProps = ${componentName}();
+  auto const &rawProps = RawProps(folly::dynamic::object("${propName}", ${propValue}));
 
   ContextContainer contextContainer{};
   PropsParserContext parserContext{-1, contextContainer};
 
-  rawProps.parse(propParser);
+  rawProps.parse(propParser, parserContext);
   ${componentName}(parserContext, sourceProps, rawProps);
 }
 `;

packages/react-native-codegen/src/generators/components/__tests__/__snapshots__/GeneratePropsJavaInterface-test.js.snap

@@ -2,7 +2,7 @@
 
 exports[`GeneratePropsJavaInterface can generate fixture ARRAY_PROPS 1`] = `
 Map {
-  "java/com/facebook/react/viewmanagers/ArrayPropsNativeComponentManagerInterface.java" => "/**
+  "java/com/facebook/react/viewmanagers/ArrayPropsNativeComponentManagerInterface.kt" => "/**
 * This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
 *
 * Do not edit this file as changes may cause incorrect behavior and will be lost
@@ -11,27 +11,26 @@ Map {
 * @generated by codegen project: GeneratePropsJavaInterface.js
 */
 
-package com.facebook.react.viewmanagers;
+package com.facebook.react.viewmanagers
 
 import android.view.View;
-import androidx.annotation.Nullable;
 import com.facebook.react.bridge.ReadableArray;
 import com.facebook.react.uimanager.ViewManagerWithGeneratedInterface;
 
-public interface ArrayPropsNativeComponentManagerInterface<T extends View> extends ViewManagerWithGeneratedInterface {
-  void setNames(T view, @Nullable ReadableArray value);
-  void setDisableds(T view, @Nullable ReadableArray value);
-  void setProgress(T view, @Nullable ReadableArray value);
-  void setRadii(T view, @Nullable ReadableArray value);
-  void setColors(T view, @Nullable ReadableArray value);
-  void setSrcs(T view, @Nullable ReadableArray value);
-  void setPoints(T view, @Nullable ReadableArray value);
-  void setDimensions(T view, @Nullable ReadableArray value);
-  void setSizes(T view, @Nullable ReadableArray value);
-  void setObject(T view, @Nullable ReadableArray value);
-  void setArray(T view, @Nullable ReadableArray value);
-  void setArrayOfArrayOfObject(T view, @Nullable ReadableArray value);
-  void setArrayOfMixed(T view, @Nullable ReadableArray value);
+public interface ArrayPropsNativeComponentManagerInterface<T: View>: ViewManagerWithGeneratedInterface {
+  public fun setNames(view: T, value: ReadableArray?): Unit
+  public fun setDisableds(view: T, value: ReadableArray?): Unit
+  public fun setProgress(view: T, value: ReadableArray?): Unit
+  public fun setRadii(view: T, value: ReadableArray?): Unit
+  public fun setColors(view: T, value: ReadableArray?): Unit
+  public fun setSrcs(view: T, value: ReadableArray?): Unit
+  public fun setPoints(view: T, value: ReadableArray?): Unit
+  public fun setDimensions(view: T, value: ReadableArray?): Unit
+  public fun setSizes(view: T, value: ReadableArray?): Unit
+  public fun setObject(view: T, value: ReadableArray?): Unit
+  public fun setArray(view: T, value: ReadableArray?): Unit
+  public fun setArrayOfArrayOfObject(view: T, value: ReadableArray?): Unit
+  public fun setArrayOfMixed(view: T, value: ReadableArray?): Unit
 }
 ",
 }
@@ -39,7 +38,7 @@ public interface ArrayPropsNativeComponentManagerInterface<T extends View> exten
 
 exports[`GeneratePropsJavaInterface can generate fixture ARRAY_PROPS_WITH_NESTED_OBJECT 1`] = `
 Map {
-  "java/com/facebook/react/viewmanagers/ArrayPropsNativeComponentManagerInterface.java" => "/**
+  "java/com/facebook/react/viewmanagers/ArrayPropsNativeComponentManagerInterface.kt" => "/**
 * This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
 *
 * Do not edit this file as changes may cause incorrect behavior and will be lost
@@ -48,15 +47,14 @@ Map {
 * @generated by codegen project: GeneratePropsJavaInterface.js
 */
 
-package com.facebook.react.viewmanagers;
+package com.facebook.react.viewmanagers
 
 import android.view.View;
-import androidx.annotation.Nullable;
 import com.facebook.react.bridge.ReadableArray;
 import com.facebook.react.uimanager.ViewManagerWithGeneratedInterface;
 
-public interface ArrayPropsNativeComponentManagerInterface<T extends View> extends ViewManagerWithGeneratedInterface {
-  void setNativePrimitives(T view, @Nullable ReadableArray value);
+public interface ArrayPropsNativeComponentManagerInterface<T: View>: ViewManagerWithGeneratedInterface {
+  public fun setNativePrimitives(view: T, value: ReadableArray?): Unit
 }
 ",
 }
@@ -64,7 +62,7 @@ public interface ArrayPropsNativeComponentManagerInterface<T extends View> exten
 
 exports[`GeneratePropsJavaInterface can generate fixture BOOLEAN_PROP 1`] = `
 Map {
-  "java/com/facebook/react/viewmanagers/BooleanPropNativeComponentManagerInterface.java" => "/**
+  "java/com/facebook/react/viewmanagers/BooleanPropNativeComponentManagerInterface.kt" => "/**
 * This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
 *
 * Do not edit this file as changes may cause incorrect behavior and will be lost
@@ -73,13 +71,13 @@ Map {
 * @generated by codegen project: GeneratePropsJavaInterface.js
 */
 
-package com.facebook.react.viewmanagers;
+package com.facebook.react.viewmanagers
 
 import android.view.View;
 import com.facebook.react.uimanager.ViewManagerWithGeneratedInterface;
 
-public interface BooleanPropNativeComponentManagerInterface<T extends View> extends ViewManagerWithGeneratedInterface {
-  void setDisabled(T view, boolean value);
+public interface BooleanPropNativeComponentManagerInterface<T: View>: ViewManagerWithGeneratedInterface {
+  public fun setDisabled(view: T, value: Boolean): Unit
 }
 ",
 }
@@ -87,7 +85,7 @@ public interface BooleanPropNativeComponentManagerInterface<T extends View> exte
 
 exports[`GeneratePropsJavaInterface can generate fixture COLOR_PROP 1`] = `
 Map {
-  "java/com/facebook/react/viewmanagers/ColorPropNativeComponentManagerInterface.java" => "/**
+  "java/com/facebook/react/viewmanagers/ColorPropNativeComponentManagerInterface.kt" => "/**
 * This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
 *
 * Do not edit this file as changes may cause incorrect behavior and will be lost
@@ -96,14 +94,13 @@ Map {
 * @generated by codegen project: GeneratePropsJavaInterface.js
 */
 
-package com.facebook.react.viewmanagers;
+package com.facebook.react.viewmanagers
 
 import android.view.View;
-import androidx.annotation.Nullable;
 import com.facebook.react.uimanager.ViewManagerWithGeneratedInterface;
 
-public interface ColorPropNativeComponentManagerInterface<T extends View> extends ViewManagerWithGeneratedInterface {
-  void setTintColor(T view, @Nullable Integer value);
+public interface ColorPropNativeComponentManagerInterface<T: View>: ViewManagerWithGeneratedInterface {
+  public fun setTintColor(view: T, value: Int?): Unit
 }
 ",
 }
@@ -111,7 +108,7 @@ public interface ColorPropNativeComponentManagerInterface<T extends View> extend
 
 exports[`GeneratePropsJavaInterface can generate fixture COMMANDS 1`] = `
 Map {
-  "java/com/facebook/react/viewmanagers/CommandNativeComponentManagerInterface.java" => "/**
+  "java/com/facebook/react/viewmanagers/CommandNativeComponentManagerInterface.kt" => "/**
 * This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
 *
 * Do not edit this file as changes may cause incorrect behavior and will be lost
@@ -120,16 +117,16 @@ Map {
 * @generated by codegen project: GeneratePropsJavaInterface.js
 */
 
-package com.facebook.react.viewmanagers;
+package com.facebook.react.viewmanagers
 
 import android.view.View;
 import com.facebook.react.bridge.ReadableArray;
 import com.facebook.react.uimanager.ViewManagerWithGeneratedInterface;
 
-public interface CommandNativeComponentManagerInterface<T extends View> extends ViewManagerWithGeneratedInterface {
+public interface CommandNativeComponentManagerInterface<T: View>: ViewManagerWithGeneratedInterface {
   // No props
-  void flashScrollIndicators(T view);
-  void allTypes(T view, int x, float y, double z, String message, boolean animated, ReadableArray locations);
+  public fun flashScrollIndicators(view: T): Unit
+  public fun allTypes(view: T, x: Int, y: Float, z: Double, message: String, animated: Boolean, locations: ReadableArray): Unit
 }
 ",
 }
@@ -137,7 +134,7 @@ public interface CommandNativeComponentManagerInterface<T extends View> extends
 
 exports[`GeneratePropsJavaInterface can generate fixture COMMANDS_AND_PROPS 1`] = `
 Map {
-  "java/com/facebook/react/viewmanagers/CommandNativeComponentManagerInterface.java" => "/**
+  "java/com/facebook/react/viewmanagers/CommandNativeComponentManagerInterface.kt" => "/**
 * This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
 *
 * Do not edit this file as changes may cause incorrect behavior and will be lost
@@ -146,18 +143,17 @@ Map {
 * @generated by codegen project: GeneratePropsJavaInterface.js
 */
 
-package com.facebook.react.viewmanagers;
+package com.facebook.react.viewmanagers
 
 import android.view.View;
-import androidx.annotation.Nullable;
 import com.facebook.react.bridge.ReadableArray;
 import com.facebook.react.uimanager.ViewManagerWithGeneratedInterface;
 
-public interface CommandNativeComponentManagerInterface<T extends View> extends ViewManagerWithGeneratedInterface {
-  void setAccessibilityHint(T view, @Nullable String value);
-  void handleRootTag(T view, double rootTag);
-  void hotspotUpdate(T view, int x, int y);
-  void addItems(T view, ReadableArray items);
+public interface CommandNativeComponentManagerInterface<T: View>: ViewManagerWithGeneratedInterface {
+  public fun setAccessibilityHint(view: T, value: String?): Unit
+  public fun handleRootTag(view: T, rootTag: Double): Unit
+  public fun hotspotUpdate(view: T, x: Int, y: Int): Unit
+  public fun addItems(view: T, items: ReadableArray): Unit
 }
 ",
 }
@@ -165,7 +161,7 @@ public interface CommandNativeComponentManagerInterface<T extends View> extends
 
 exports[`GeneratePropsJavaInterface can generate fixture DIMENSION_PROP 1`] = `
 Map {
-  "java/com/facebook/react/viewmanagers/DimensionPropNativeComponentManagerInterface.java" => "/**
+  "java/com/facebook/react/viewmanagers/DimensionPropNativeComponentManagerInterface.kt" => "/**
 * This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
 *
 * Do not edit this file as changes may cause incorrect behavior and will be lost
@@ -174,15 +170,14 @@ Map {
 * @generated by codegen project: GeneratePropsJavaInterface.js
 */
 
-package com.facebook.react.viewmanagers;
+package com.facebook.react.viewmanagers
 
 import android.view.View;
-import androidx.annotation.Nullable;
 import com.facebook.react.uimanager.ViewManagerWithGeneratedInterface;
 import com.facebook.yoga.YogaValue;
 
-public interface DimensionPropNativeComponentManagerInterface<T extends View> extends ViewManagerWithGeneratedInterface {
-  void setMarginBack(T view, @Nullable YogaValue value);
+public interface DimensionPropNativeComponentManagerInterface<T: View>: ViewManagerWithGeneratedInterface {
+  public fun setMarginBack(view: T, value: YogaValue?): Unit
 }
 ",
 }
@@ -190,7 +185,7 @@ public interface DimensionPropNativeComponentManagerInterface<T extends View> ex
 
 exports[`GeneratePropsJavaInterface can generate fixture DOUBLE_PROPS 1`] = `
 Map {
-  "java/com/facebook/react/viewmanagers/DoublePropNativeComponentManagerInterface.java" => "/**
+  "java/com/facebook/react/viewmanagers/DoublePropNativeComponentManagerInterface.kt" => "/**
 * This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
 *
 * Do not edit this file as changes may cause incorrect behavior and will be lost
@@ -199,18 +194,18 @@ Map {
 * @generated by codegen project: GeneratePropsJavaInterface.js
 */
 
-package com.facebook.react.viewmanagers;
+package com.facebook.react.viewmanagers
 
 import android.view.View;
 import com.facebook.react.uimanager.ViewManagerWithGeneratedInterface;
 
-public interface DoublePropNativeComponentManagerInterface<T extends View> extends ViewManagerWithGeneratedInterface {
-  void setBlurRadius(T view, double value);
-  void setBlurRadius2(T view, double value);
-  void setBlurRadius3(T view, double value);
-  void setBlurRadius4(T view, double value);
-  void setBlurRadius5(T view, double value);
-  void setBlurRadius6(T view, double value);
+public interface DoublePropNativeComponentManagerInterface<T: View>: ViewManagerWithGeneratedInterface {
+  public fun setBlurRadius(view: T, value: Double): Unit
+  public fun setBlurRadius2(view: T, value: Double): Unit
+  public fun setBlurRadius3(view: T, value: Double): Unit
+  public fun setBlurRadius4(view: T, value: Double): Unit
+  public fun setBlurRadius5(view: T, value: Double): Unit
+  public fun setBlurRadius6(view: T, value: Double): Unit
 }
 ",
 }
@@ -218,7 +213,7 @@ public interface DoublePropNativeComponentManagerInterface<T extends View> exten
 
 exports[`GeneratePropsJavaInterface can generate fixture EVENT_NESTED_OBJECT_PROPS 1`] = `
 Map {
-  "java/com/facebook/react/viewmanagers/EventsNestedObjectNativeComponentManagerInterface.java" => "/**
+  "java/com/facebook/react/viewmanagers/EventsNestedObjectNativeComponentManagerInterface.kt" => "/**
 * This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
 *
 * Do not edit this file as changes may cause incorrect behavior and will be lost
@@ -227,13 +222,13 @@ Map {
 * @generated by codegen project: GeneratePropsJavaInterface.js
 */
 
-package com.facebook.react.viewmanagers;
+package com.facebook.react.viewmanagers
 
 import android.view.View;
 import com.facebook.react.uimanager.ViewManagerWithGeneratedInterface;
 
-public interface EventsNestedObjectNativeComponentManagerInterface<T extends View> extends ViewManagerWithGeneratedInterface {
-  void setDisabled(T view, boolean value);
+public interface EventsNestedObjectNativeComponentManagerInterface<T: View>: ViewManagerWithGeneratedInterface {
+  public fun setDisabled(view: T, value: Boolean): Unit
 }
 ",
 }
@@ -241,7 +236,7 @@ public interface EventsNestedObjectNativeComponentManagerInterface<T extends Vie
 
 exports[`GeneratePropsJavaInterface can generate fixture EVENT_PROPS 1`] = `
 Map {
-  "java/com/facebook/react/viewmanagers/EventsNativeComponentManagerInterface.java" => "/**
+  "java/com/facebook/react/viewmanagers/EventsNativeComponentManagerInterface.kt" => "/**
 * This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
 *
 * Do not edit this file as changes may cause incorrect behavior and will be lost
@@ -250,13 +245,13 @@ Map {
 * @generated by codegen project: GeneratePropsJavaInterface.js
 */
 
-package com.facebook.react.viewmanagers;
+package com.facebook.react.viewmanagers
 
 import android.view.View;
 import com.facebook.react.uimanager.ViewManagerWithGeneratedInterface;
 
-public interface EventsNativeComponentManagerInterface<T extends View> extends ViewManagerWithGeneratedInterface {
-  void setDisabled(T view, boolean value);
+public interface EventsNativeComponentManagerInterface<T: View>: ViewManagerWithGeneratedInterface {
+  public fun setDisabled(view: T, value: Boolean): Unit
 }
 ",
 }
@@ -264,7 +259,7 @@ public interface EventsNativeComponentManagerInterface<T extends View> extends V
 
 exports[`GeneratePropsJavaInterface can generate fixture EVENTS_WITH_PAPER_NAME 1`] = `
 Map {
-  "java/com/facebook/react/viewmanagers/InterfaceOnlyComponentManagerInterface.java" => "/**
+  "java/com/facebook/react/viewmanagers/InterfaceOnlyComponentManagerInterface.kt" => "/**
 * This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
 *
 * Do not edit this file as changes may cause incorrect behavior and will be lost
@@ -273,12 +268,12 @@ Map {
 * @generated by codegen project: GeneratePropsJavaInterface.js
 */
 
-package com.facebook.react.viewmanagers;
+package com.facebook.react.viewmanagers
 
 import android.view.View;
 import com.facebook.react.uimanager.ViewManagerWithGeneratedInterface;
 
-public interface InterfaceOnlyComponentManagerInterface<T extends View> extends ViewManagerWithGeneratedInterface {
+public interface InterfaceOnlyComponentManagerInterface<T: View>: ViewManagerWithGeneratedInterface {
   // No props
 }
 ",
@@ -291,7 +286,7 @@ exports[`GeneratePropsJavaInterface can generate fixture EXCLUDE_ANDROID_IOS 1`]
 
 exports[`GeneratePropsJavaInterface can generate fixture EXCLUDE_IOS_TWO_COMPONENTS_DIFFERENT_FILES 1`] = `
 Map {
-  "java/com/facebook/react/viewmanagers/ExcludedIosComponentManagerInterface.java" => "/**
+  "java/com/facebook/react/viewmanagers/ExcludedIosComponentManagerInterface.kt" => "/**
 * This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
 *
 * Do not edit this file as changes may cause incorrect behavior and will be lost
@@ -300,16 +295,16 @@ Map {
 * @generated by codegen project: GeneratePropsJavaInterface.js
 */
 
-package com.facebook.react.viewmanagers;
+package com.facebook.react.viewmanagers
 
 import android.view.View;
 import com.facebook.react.uimanager.ViewManagerWithGeneratedInterface;
 
-public interface ExcludedIosComponentManagerInterface<T extends View> extends ViewManagerWithGeneratedInterface {
+public interface ExcludedIosComponentManagerInterface<T: View>: ViewManagerWithGeneratedInterface {
   // No props
 }
 ",
-  "java/com/facebook/react/viewmanagers/MultiFileIncludedNativeComponentManagerInterface.java" => "/**
+  "java/com/facebook/react/viewmanagers/MultiFileIncludedNativeComponentManagerInterface.kt" => "/**
 * This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
 *
 * Do not edit this file as changes may cause incorrect behavior and will be lost
@@ -318,13 +313,13 @@ public interface ExcludedIosComponentManagerInterface<T extends View> extends Vi
 * @generated by codegen project: GeneratePropsJavaInterface.js
 */
 
-package com.facebook.react.viewmanagers;
+package com.facebook.react.viewmanagers
 
 import android.view.View;
 import com.facebook.react.uimanager.ViewManagerWithGeneratedInterface;
 
-public interface MultiFileIncludedNativeComponentManagerInterface<T extends View> extends ViewManagerWithGeneratedInterface {
-  void setDisabled(T view, boolean value);
+public interface MultiFileIncludedNativeComponentManagerInterface<T: View>: ViewManagerWithGeneratedInterface {
+  public fun setDisabled(view: T, value: Boolean): Unit
 }
 ",
 }
@@ -332,7 +327,7 @@ public interface MultiFileIncludedNativeComponentManagerInterface<T extends View
 
 exports[`GeneratePropsJavaInterface can generate fixture FLOAT_PROPS 1`] = `
 Map {
-  "java/com/facebook/react/viewmanagers/FloatPropNativeComponentManagerInterface.java" => "/**
+  "java/com/facebook/react/viewmanagers/FloatPropNativeComponentManagerInterface.kt" => "/**
 * This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
 *
 * Do not edit this file as changes may cause incorrect behavior and will be lost
@@ -341,18 +336,18 @@ Map {
 * @generated by codegen project: GeneratePropsJavaInterface.js
 */
 
-package com.facebook.react.viewmanagers;
+package com.facebook.react.viewmanagers
 
 import android.view.View;
 import com.facebook.react.uimanager.ViewManagerWithGeneratedInterface;
 
-public interface FloatPropNativeComponentManagerInterface<T extends View> extends ViewManagerWithGeneratedInterface {
-  void setBlurRadius(T view, float value);
-  void setBlurRadius2(T view, float value);
-  void setBlurRadius3(T view, float value);
-  void setBlurRadius4(T view, float value);
-  void setBlurRadius5(T view, float value);
-  void setBlurRadius6(T view, float value);
+public interface FloatPropNativeComponentManagerInterface<T: View>: ViewManagerWithGeneratedInterface {
+  public fun setBlurRadius(view: T, value: Float): Unit
+  public fun setBlurRadius2(view: T, value: Float): Unit
+  public fun setBlurRadius3(view: T, value: Float): Unit
+  public fun setBlurRadius4(view: T, value: Float): Unit
+  public fun setBlurRadius5(view: T, value: Float): Unit
+  public fun setBlurRadius6(view: T, value: Float): Unit
 }
 ",
 }
@@ -360,7 +355,7 @@ public interface FloatPropNativeComponentManagerInterface<T extends View> extend
 
 exports[`GeneratePropsJavaInterface can generate fixture IMAGE_PROP 1`] = `
 Map {
-  "java/com/facebook/react/viewmanagers/ImagePropNativeComponentManagerInterface.java" => "/**
+  "java/com/facebook/react/viewmanagers/ImagePropNativeComponentManagerInterface.kt" => "/**
 * This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
 *
 * Do not edit this file as changes may cause incorrect behavior and will be lost
@@ -369,15 +364,14 @@ Map {
 * @generated by codegen project: GeneratePropsJavaInterface.js
 */
 
-package com.facebook.react.viewmanagers;
+package com.facebook.react.viewmanagers
 
 import android.view.View;
-import androidx.annotation.Nullable;
 import com.facebook.react.bridge.ReadableMap;
 import com.facebook.react.uimanager.ViewManagerWithGeneratedInterface;
 
-public interface ImagePropNativeComponentManagerInterface<T extends View> extends ViewManagerWithGeneratedInterface {
-  void setThumbImage(T view, @Nullable ReadableMap value);
+public interface ImagePropNativeComponentManagerInterface<T: View>: ViewManagerWithGeneratedInterface {
+  public fun setThumbImage(view: T, value: ReadableMap?): Unit
 }
 ",
 }
@@ -385,7 +379,7 @@ public interface ImagePropNativeComponentManagerInterface<T extends View> extend
 
 exports[`GeneratePropsJavaInterface can generate fixture INSETS_PROP 1`] = `
 Map {
-  "java/com/facebook/react/viewmanagers/InsetsPropNativeComponentManagerInterface.java" => "/**
+  "java/com/facebook/react/viewmanagers/InsetsPropNativeComponentManagerInterface.kt" => "/**
 * This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
 *
 * Do not edit this file as changes may cause incorrect behavior and will be lost
@@ -394,15 +388,14 @@ Map {
 * @generated by codegen project: GeneratePropsJavaInterface.js
 */
 
-package com.facebook.react.viewmanagers;
+package com.facebook.react.viewmanagers
 
 import android.view.View;
-import androidx.annotation.Nullable;
 import com.facebook.react.bridge.ReadableMap;
 import com.facebook.react.uimanager.ViewManagerWithGeneratedInterface;
 
-public interface InsetsPropNativeComponentManagerInterface<T extends View> extends ViewManagerWithGeneratedInterface {
-  void setContentInset(T view, @Nullable ReadableMap value);
+public interface InsetsPropNativeComponentManagerInterface<T: View>: ViewManagerWithGeneratedInterface {
+  public fun setContentInset(view: T, value: ReadableMap?): Unit
 }
 ",
 }
@@ -410,7 +403,7 @@ public interface InsetsPropNativeComponentManagerInterface<T extends View> exten
 
 exports[`GeneratePropsJavaInterface can generate fixture INT32_ENUM_PROP 1`] = `
 Map {
-  "java/com/facebook/react/viewmanagers/Int32EnumPropsNativeComponentManagerInterface.java" => "/**
+  "java/com/facebook/react/viewmanagers/Int32EnumPropsNativeComponentManagerInterface.kt" => "/**
 * This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
 *
 * Do not edit this file as changes may cause incorrect behavior and will be lost
@@ -419,14 +412,13 @@ Map {
 * @generated by codegen project: GeneratePropsJavaInterface.js
 */
 
-package com.facebook.react.viewmanagers;
+package com.facebook.react.viewmanagers
 
 import android.view.View;
-import androidx.annotation.Nullable;
 import com.facebook.react.uimanager.ViewManagerWithGeneratedInterface;
 
-public interface Int32EnumPropsNativeComponentManagerInterface<T extends View> extends ViewManagerWithGeneratedInterface {
-  void setMaxInterval(T view, @Nullable Integer value);
+public interface Int32EnumPropsNativeComponentManagerInterface<T: View>: ViewManagerWithGeneratedInterface {
+  public fun setMaxInterval(view: T, value: Int?): Unit
 }
 ",
 }
@@ -434,7 +426,7 @@ public interface Int32EnumPropsNativeComponentManagerInterface<T extends View> e
 
 exports[`GeneratePropsJavaInterface can generate fixture INTEGER_PROPS 1`] = `
 Map {
-  "java/com/facebook/react/viewmanagers/IntegerPropNativeComponentManagerInterface.java" => "/**
+  "java/com/facebook/react/viewmanagers/IntegerPropNativeComponentManagerInterface.kt" => "/**
 * This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
 *
 * Do not edit this file as changes may cause incorrect behavior and will be lost
@@ -443,15 +435,15 @@ Map {
 * @generated by codegen project: GeneratePropsJavaInterface.js
 */
 
-package com.facebook.react.viewmanagers;
+package com.facebook.react.viewmanagers
 
 import android.view.View;
 import com.facebook.react.uimanager.ViewManagerWithGeneratedInterface;
 
-public interface IntegerPropNativeComponentManagerInterface<T extends View> extends ViewManagerWithGeneratedInterface {
-  void setProgress1(T view, int value);
-  void setProgress2(T view, int value);
-  void setProgress3(T view, int value);
+public interface IntegerPropNativeComponentManagerInterface<T: View>: ViewManagerWithGeneratedInterface {
+  public fun setProgress1(view: T, value: Int): Unit
+  public fun setProgress2(view: T, value: Int): Unit
+  public fun setProgress3(view: T, value: Int): Unit
 }
 ",
 }
@@ -459,7 +451,7 @@ public interface IntegerPropNativeComponentManagerInterface<T extends View> exte
 
 exports[`GeneratePropsJavaInterface can generate fixture INTERFACE_ONLY 1`] = `
 Map {
-  "java/com/facebook/react/viewmanagers/InterfaceOnlyComponentManagerInterface.java" => "/**
+  "java/com/facebook/react/viewmanagers/InterfaceOnlyComponentManagerInterface.kt" => "/**
 * This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
 *
 * Do not edit this file as changes may cause incorrect behavior and will be lost
@@ -468,14 +460,13 @@ Map {
 * @generated by codegen project: GeneratePropsJavaInterface.js
 */
 
-package com.facebook.react.viewmanagers;
+package com.facebook.react.viewmanagers
 
 import android.view.View;
-import androidx.annotation.Nullable;
 import com.facebook.react.uimanager.ViewManagerWithGeneratedInterface;
 
-public interface InterfaceOnlyComponentManagerInterface<T extends View> extends ViewManagerWithGeneratedInterface {
-  void setAccessibilityHint(T view, @Nullable String value);
+public interface InterfaceOnlyComponentManagerInterface<T: View>: ViewManagerWithGeneratedInterface {
+  public fun setAccessibilityHint(view: T, value: String?): Unit
 }
 ",
 }
@@ -483,7 +474,7 @@ public interface InterfaceOnlyComponentManagerInterface<T extends View> extends
 
 exports[`GeneratePropsJavaInterface can generate fixture MIXED_PROP 1`] = `
 Map {
-  "java/com/facebook/react/viewmanagers/MixedPropNativeComponentManagerInterface.java" => "/**
+  "java/com/facebook/react/viewmanagers/MixedPropNativeComponentManagerInterface.kt" => "/**
 * This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
 *
 * Do not edit this file as changes may cause incorrect behavior and will be lost
@@ -492,14 +483,14 @@ Map {
 * @generated by codegen project: GeneratePropsJavaInterface.js
 */
 
-package com.facebook.react.viewmanagers;
+package com.facebook.react.viewmanagers
 
 import android.view.View;
 import com.facebook.react.bridge.Dynamic;
 import com.facebook.react.uimanager.ViewManagerWithGeneratedInterface;
 
-public interface MixedPropNativeComponentManagerInterface<T extends View> extends ViewManagerWithGeneratedInterface {
-  void setMixedProp(T view, Dynamic value);
+public interface MixedPropNativeComponentManagerInterface<T: View>: ViewManagerWithGeneratedInterface {
+  public fun setMixedProp(view: T, value: Dynamic): Unit
 }
 ",
 }
@@ -507,7 +498,7 @@ public interface MixedPropNativeComponentManagerInterface<T extends View> extend
 
 exports[`GeneratePropsJavaInterface can generate fixture MULTI_NATIVE_PROP 1`] = `
 Map {
-  "java/com/facebook/react/viewmanagers/ImageColorPropNativeComponentManagerInterface.java" => "/**
+  "java/com/facebook/react/viewmanagers/ImageColorPropNativeComponentManagerInterface.kt" => "/**
 * This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
 *
 * Do not edit this file as changes may cause incorrect behavior and will be lost
@@ -516,18 +507,17 @@ Map {
 * @generated by codegen project: GeneratePropsJavaInterface.js
 */
 
-package com.facebook.react.viewmanagers;
+package com.facebook.react.viewmanagers
 
 import android.view.View;
-import androidx.annotation.Nullable;
 import com.facebook.react.bridge.ReadableMap;
 import com.facebook.react.uimanager.ViewManagerWithGeneratedInterface;
 
-public interface ImageColorPropNativeComponentManagerInterface<T extends View> extends ViewManagerWithGeneratedInterface {
-  void setThumbImage(T view, @Nullable ReadableMap value);
-  void setColor(T view, @Nullable Integer value);
-  void setThumbTintColor(T view, @Nullable Integer value);
-  void setPoint(T view, @Nullable ReadableMap value);
+public interface ImageColorPropNativeComponentManagerInterface<T: View>: ViewManagerWithGeneratedInterface {
+  public fun setThumbImage(view: T, value: ReadableMap?): Unit
+  public fun setColor(view: T, value: Int?): Unit
+  public fun setThumbTintColor(view: T, value: Int?): Unit
+  public fun setPoint(view: T, value: ReadableMap?): Unit
 }
 ",
 }
@@ -535,7 +525,7 @@ public interface ImageColorPropNativeComponentManagerInterface<T extends View> e
 
 exports[`GeneratePropsJavaInterface can generate fixture NO_PROPS_NO_EVENTS 1`] = `
 Map {
-  "java/com/facebook/react/viewmanagers/NoPropsNoEventsComponentManagerInterface.java" => "/**
+  "java/com/facebook/react/viewmanagers/NoPropsNoEventsComponentManagerInterface.kt" => "/**
 * This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
 *
 * Do not edit this file as changes may cause incorrect behavior and will be lost
@@ -544,12 +534,12 @@ Map {
 * @generated by codegen project: GeneratePropsJavaInterface.js
 */
 
-package com.facebook.react.viewmanagers;
+package com.facebook.react.viewmanagers
 
 import android.view.View;
 import com.facebook.react.uimanager.ViewManagerWithGeneratedInterface;
 
-public interface NoPropsNoEventsComponentManagerInterface<T extends View> extends ViewManagerWithGeneratedInterface {
+public interface NoPropsNoEventsComponentManagerInterface<T: View>: ViewManagerWithGeneratedInterface {
   // No props
 }
 ",
@@ -558,7 +548,7 @@ public interface NoPropsNoEventsComponentManagerInterface<T extends View> extend
 
 exports[`GeneratePropsJavaInterface can generate fixture OBJECT_PROPS 1`] = `
 Map {
-  "java/com/facebook/react/viewmanagers/ObjectPropsManagerInterface.java" => "/**
+  "java/com/facebook/react/viewmanagers/ObjectPropsManagerInterface.kt" => "/**
 * This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
 *
 * Do not edit this file as changes may cause incorrect behavior and will be lost
@@ -567,15 +557,14 @@ Map {
 * @generated by codegen project: GeneratePropsJavaInterface.js
 */
 
-package com.facebook.react.viewmanagers;
+package com.facebook.react.viewmanagers
 
 import android.view.View;
-import androidx.annotation.Nullable;
 import com.facebook.react.bridge.ReadableMap;
 import com.facebook.react.uimanager.ViewManagerWithGeneratedInterface;
 
-public interface ObjectPropsManagerInterface<T extends View> extends ViewManagerWithGeneratedInterface {
-  void setObjectProp(T view, @Nullable ReadableMap value);
+public interface ObjectPropsManagerInterface<T: View>: ViewManagerWithGeneratedInterface {
+  public fun setObjectProp(view: T, value: ReadableMap?): Unit
 }
 ",
 }
@@ -583,7 +572,7 @@ public interface ObjectPropsManagerInterface<T extends View> extends ViewManager
 
 exports[`GeneratePropsJavaInterface can generate fixture POINT_PROP 1`] = `
 Map {
-  "java/com/facebook/react/viewmanagers/PointPropNativeComponentManagerInterface.java" => "/**
+  "java/com/facebook/react/viewmanagers/PointPropNativeComponentManagerInterface.kt" => "/**
 * This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
 *
 * Do not edit this file as changes may cause incorrect behavior and will be lost
@@ -592,15 +581,14 @@ Map {
 * @generated by codegen project: GeneratePropsJavaInterface.js
 */
 
-package com.facebook.react.viewmanagers;
+package com.facebook.react.viewmanagers
 
 import android.view.View;
-import androidx.annotation.Nullable;
 import com.facebook.react.bridge.ReadableMap;
 import com.facebook.react.uimanager.ViewManagerWithGeneratedInterface;
 
-public interface PointPropNativeComponentManagerInterface<T extends View> extends ViewManagerWithGeneratedInterface {
-  void setStartPoint(T view, @Nullable ReadableMap value);
+public interface PointPropNativeComponentManagerInterface<T: View>: ViewManagerWithGeneratedInterface {
+  public fun setStartPoint(view: T, value: ReadableMap?): Unit
 }
 ",
 }
@@ -608,7 +596,7 @@ public interface PointPropNativeComponentManagerInterface<T extends View> extend
 
 exports[`GeneratePropsJavaInterface can generate fixture STRING_ENUM_PROP 1`] = `
 Map {
-  "java/com/facebook/react/viewmanagers/StringEnumPropsNativeComponentManagerInterface.java" => "/**
+  "java/com/facebook/react/viewmanagers/StringEnumPropsNativeComponentManagerInterface.kt" => "/**
 * This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
 *
 * Do not edit this file as changes may cause incorrect behavior and will be lost
@@ -617,14 +605,13 @@ Map {
 * @generated by codegen project: GeneratePropsJavaInterface.js
 */
 
-package com.facebook.react.viewmanagers;
+package com.facebook.react.viewmanagers
 
 import android.view.View;
-import androidx.annotation.Nullable;
 import com.facebook.react.uimanager.ViewManagerWithGeneratedInterface;
 
-public interface StringEnumPropsNativeComponentManagerInterface<T extends View> extends ViewManagerWithGeneratedInterface {
-  void setAlignment(T view, @Nullable String value);
+public interface StringEnumPropsNativeComponentManagerInterface<T: View>: ViewManagerWithGeneratedInterface {
+  public fun setAlignment(view: T, value: String?): Unit
 }
 ",
 }
@@ -632,7 +619,7 @@ public interface StringEnumPropsNativeComponentManagerInterface<T extends View>
 
 exports[`GeneratePropsJavaInterface can generate fixture STRING_PROP 1`] = `
 Map {
-  "java/com/facebook/react/viewmanagers/StringPropComponentManagerInterface.java" => "/**
+  "java/com/facebook/react/viewmanagers/StringPropComponentManagerInterface.kt" => "/**
 * This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
 *
 * Do not edit this file as changes may cause incorrect behavior and will be lost
@@ -641,15 +628,14 @@ Map {
 * @generated by codegen project: GeneratePropsJavaInterface.js
 */
 
-package com.facebook.react.viewmanagers;
+package com.facebook.react.viewmanagers
 
 import android.view.View;
-import androidx.annotation.Nullable;
 import com.facebook.react.uimanager.ViewManagerWithGeneratedInterface;
 
-public interface StringPropComponentManagerInterface<T extends View> extends ViewManagerWithGeneratedInterface {
-  void setAccessibilityHint(T view, @Nullable String value);
-  void setAccessibilityRole(T view, @Nullable String value);
+public interface StringPropComponentManagerInterface<T: View>: ViewManagerWithGeneratedInterface {
+  public fun setAccessibilityHint(view: T, value: String?): Unit
+  public fun setAccessibilityRole(view: T, value: String?): Unit
 }
 ",
 }
@@ -657,7 +643,7 @@ public interface StringPropComponentManagerInterface<T extends View> extends Vie
 
 exports[`GeneratePropsJavaInterface can generate fixture TWO_COMPONENTS_DIFFERENT_FILES 1`] = `
 Map {
-  "java/com/facebook/react/viewmanagers/MultiFile1NativeComponentManagerInterface.java" => "/**
+  "java/com/facebook/react/viewmanagers/MultiFile1NativeComponentManagerInterface.kt" => "/**
 * This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
 *
 * Do not edit this file as changes may cause incorrect behavior and will be lost
@@ -666,16 +652,16 @@ Map {
 * @generated by codegen project: GeneratePropsJavaInterface.js
 */
 
-package com.facebook.react.viewmanagers;
+package com.facebook.react.viewmanagers
 
 import android.view.View;
 import com.facebook.react.uimanager.ViewManagerWithGeneratedInterface;
 
-public interface MultiFile1NativeComponentManagerInterface<T extends View> extends ViewManagerWithGeneratedInterface {
-  void setDisabled(T view, boolean value);
+public interface MultiFile1NativeComponentManagerInterface<T: View>: ViewManagerWithGeneratedInterface {
+  public fun setDisabled(view: T, value: Boolean): Unit
 }
 ",
-  "java/com/facebook/react/viewmanagers/MultiFile2NativeComponentManagerInterface.java" => "/**
+  "java/com/facebook/react/viewmanagers/MultiFile2NativeComponentManagerInterface.kt" => "/**
 * This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
 *
 * Do not edit this file as changes may cause incorrect behavior and will be lost
@@ -684,13 +670,13 @@ public interface MultiFile1NativeComponentManagerInterface<T extends View> exten
 * @generated by codegen project: GeneratePropsJavaInterface.js
 */
 
-package com.facebook.react.viewmanagers;
+package com.facebook.react.viewmanagers
 
 import android.view.View;
 import com.facebook.react.uimanager.ViewManagerWithGeneratedInterface;
 
-public interface MultiFile2NativeComponentManagerInterface<T extends View> extends ViewManagerWithGeneratedInterface {
-  void setDisabled(T view, boolean value);
+public interface MultiFile2NativeComponentManagerInterface<T: View>: ViewManagerWithGeneratedInterface {
+  public fun setDisabled(view: T, value: Boolean): Unit
 }
 ",
 }
@@ -698,7 +684,7 @@ public interface MultiFile2NativeComponentManagerInterface<T extends View> exten
 
 exports[`GeneratePropsJavaInterface can generate fixture TWO_COMPONENTS_SAME_FILE 1`] = `
 Map {
-  "java/com/facebook/react/viewmanagers/MultiComponent1NativeComponentManagerInterface.java" => "/**
+  "java/com/facebook/react/viewmanagers/MultiComponent1NativeComponentManagerInterface.kt" => "/**
 * This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
 *
 * Do not edit this file as changes may cause incorrect behavior and will be lost
@@ -707,16 +693,16 @@ Map {
 * @generated by codegen project: GeneratePropsJavaInterface.js
 */
 
-package com.facebook.react.viewmanagers;
+package com.facebook.react.viewmanagers
 
 import android.view.View;
 import com.facebook.react.uimanager.ViewManagerWithGeneratedInterface;
 
-public interface MultiComponent1NativeComponentManagerInterface<T extends View> extends ViewManagerWithGeneratedInterface {
-  void setDisabled(T view, boolean value);
+public interface MultiComponent1NativeComponentManagerInterface<T: View>: ViewManagerWithGeneratedInterface {
+  public fun setDisabled(view: T, value: Boolean): Unit
 }
 ",
-  "java/com/facebook/react/viewmanagers/MultiComponent2NativeComponentManagerInterface.java" => "/**
+  "java/com/facebook/react/viewmanagers/MultiComponent2NativeComponentManagerInterface.kt" => "/**
 * This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
 *
 * Do not edit this file as changes may cause incorrect behavior and will be lost
@@ -725,13 +711,13 @@ public interface MultiComponent1NativeComponentManagerInterface<T extends View>
 * @generated by codegen project: GeneratePropsJavaInterface.js
 */
 
-package com.facebook.react.viewmanagers;
+package com.facebook.react.viewmanagers
 
 import android.view.View;
 import com.facebook.react.uimanager.ViewManagerWithGeneratedInterface;
 
-public interface MultiComponent2NativeComponentManagerInterface<T extends View> extends ViewManagerWithGeneratedInterface {
-  void setDisabled(T view, boolean value);
+public interface MultiComponent2NativeComponentManagerInterface<T: View>: ViewManagerWithGeneratedInterface {
+  public fun setDisabled(view: T, value: Boolean): Unit
 }
 ",
 }

packages/react-native-compatibility-check/package.json

@@ -19,7 +19,7 @@
   ],
   "bugs": "https://github.com/facebook/react-native/issues",
   "engines": {
-    "node": ">= 20.19.4"
+    "node": ">= 22.14.0"
   },
   "exports": {
     ".": "./src/index.js",

packages/react-native/Libraries/Animated/__tests__/Animated-test.js

@@ -31,8 +31,12 @@ function mockQueueMicrotask() {
 }
 
 describe('Animated', () => {
+  let ReactNativeFeatureFlags;
+
   beforeEach(() => {
     jest.resetModules();
+
+    ReactNativeFeatureFlags = require('../../../src/private/featureflags/ReactNativeFeatureFlags');
   });
 
   mockQueueMicrotask();
@@ -109,7 +113,50 @@ describe('Animated', () => {
       expect(callback.mock.calls.length).toBe(1);
     });
 
+    it('does not detach on updates', async () => {
+      ReactNativeFeatureFlags.override({
+        scheduleAnimatedCleanupInMicrotask: () => false,
+      });
+
+      const opacity = new Animated.Value(0);
+      jest.spyOn(opacity, '__detach');
+
+      const root = await create(<Animated.View style={{opacity}} />);
+      expect(opacity.__detach).not.toBeCalled();
+
+      await update(root, <Animated.View style={{opacity}} />);
+      expect(opacity.__detach).not.toBeCalled();
+
+      await unmount(root);
+      expect(opacity.__detach).toBeCalled();
+    });
+
+    it('stops animation when detached', async () => {
+      ReactNativeFeatureFlags.override({
+        scheduleAnimatedCleanupInMicrotask: () => false,
+      });
+
+      const opacity = new Animated.Value(0);
+      const callback = jest.fn();
+
+      const root = await create(<Animated.View style={{opacity}} />);
+
+      Animated.timing(opacity, {
+        toValue: 10,
+        duration: 1000,
+        useNativeDriver: false,
+      }).start(callback);
+
+      await unmount(root);
+
+      expect(callback).toBeCalledWith({finished: false});
+    });
+
     it('detaches only on unmount (in a microtask)', async () => {
+      ReactNativeFeatureFlags.override({
+        scheduleAnimatedCleanupInMicrotask: () => true,
+      });
+
       const opacity = new Animated.Value(0);
       jest.spyOn(opacity, '__detach');
 
@@ -128,6 +175,10 @@ describe('Animated', () => {
     });
 
     it('restores default values only on update (in a microtask)', async () => {
+      ReactNativeFeatureFlags.override({
+        scheduleAnimatedCleanupInMicrotask: () => true,
+      });
+
       const __restoreDefaultValues = jest.spyOn(
         AnimatedProps.prototype,
         '__restoreDefaultValues',
@@ -162,6 +213,10 @@ describe('Animated', () => {
     });
 
     it('stops animation when detached (in a microtask)', async () => {
+      ReactNativeFeatureFlags.override({
+        scheduleAnimatedCleanupInMicrotask: () => true,
+      });
+
       const opacity = new Animated.Value(0);
       const callback = jest.fn();
 

packages/react-native/Libraries/Components/ScrollView/__tests__/ScrollView-viewCulling-itest.js

@@ -5,6 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  *
  * @fantom_flags enableFixForParentTagDuringReparenting:true
+ * @fantom_flags enableSynchronousStateUpdates:true
  * @fantom_flags enableViewCulling:true
  * @flow strict-local
  * @format
@@ -2555,56 +2556,3 @@ describe('culling inside ScrollView with overflow visible', () => {
     );
   });
 });
-
-describe('horizontal ScrollView in RTL script', () => {
-  it('renders item 1', () => {
-    const root = Fantom.createRoot({viewportWidth: 100, viewportHeight: 100});
-
-    Fantom.runTask(() => {
-      root.render(
-        <ScrollView
-          style={{direction: 'rtl', height: 100, width: 100}}
-          horizontal={true}>
-          <View nativeID={'item1'} style={{height: 90, width: 90, margin: 5}} />
-          <View nativeID={'item2'} style={{height: 90, width: 90, margin: 5}} />
-        </ScrollView>,
-      );
-    });
-
-    expect(root.takeMountingManagerLogs()).toEqual([
-      'Update {type: "RootView", nativeID: (root)}',
-      'Create {type: "ScrollView", nativeID: (N/A)}',
-      'Create {type: "AndroidHorizontalScrollContentView", nativeID: (N/A)}',
-      'Create {type: "View", nativeID: "item1"}',
-      'Insert {type: "View", parentNativeID: (N/A), index: 0, nativeID: "item1"}',
-      'Insert {type: "AndroidHorizontalScrollContentView", parentNativeID: (N/A), index: 0, nativeID: (N/A)}',
-      'Insert {type: "ScrollView", parentNativeID: (root), index: 0, nativeID: (N/A)}',
-    ]);
-  });
-
-  it('takes contentOffset into account', () => {
-    const root = Fantom.createRoot({viewportWidth: 100, viewportHeight: 100});
-
-    Fantom.runTask(() => {
-      root.render(
-        <ScrollView
-          style={{direction: 'rtl', height: 100, width: 100}}
-          horizontal={true}
-          contentOffset={{x: 100, y: 0}}>
-          <View nativeID={'item1'} style={{height: 90, width: 90, margin: 5}} />
-          <View nativeID={'item2'} style={{height: 90, width: 90, margin: 5}} />
-        </ScrollView>,
-      );
-    });
-
-    expect(root.takeMountingManagerLogs()).toEqual([
-      'Update {type: "RootView", nativeID: (root)}',
-      'Create {type: "ScrollView", nativeID: (N/A)}',
-      'Create {type: "AndroidHorizontalScrollContentView", nativeID: (N/A)}',
-      'Create {type: "View", nativeID: "item2"}',
-      'Insert {type: "View", parentNativeID: (N/A), index: 0, nativeID: "item2"}',
-      'Insert {type: "AndroidHorizontalScrollContentView", parentNativeID: (N/A), index: 0, nativeID: (N/A)}',
-      'Insert {type: "ScrollView", parentNativeID: (root), index: 0, nativeID: (N/A)}',
-    ]);
-  });
-});

packages/react-native/Libraries/Components/View/__tests__/View-itest.js

@@ -10,14 +10,9 @@
 
 import '@react-native/fantom/src/setUpDefaultReactNativeEnvironment';
 
-import type {HostInstance} from 'react-native';
-
-import ensureInstance from '../../../../src/private/__tests__/utilities/ensureInstance';
 import * as Fantom from '@react-native/fantom';
 import * as React from 'react';
-import {createRef} from 'react';
 import {View} from 'react-native';
-import ReactNativeElement from 'react-native/src/private/webapis/dom/nodes/ReactNativeElement';
 
 describe('<View>', () => {
   describe('width and height style', () => {
@@ -186,40 +181,6 @@ describe('<View>', () => {
         <rn-view transform='[{"translateX": 10.000000}]' />,
       );
     });
-
-    [
-      [undefined, {x: -5, y: 0, width: 20, height: 10}],
-      ['50% 50%', {x: -5, y: 0, width: 20, height: 10}],
-      ['top left', {x: 0, y: 0, width: 20, height: 10}],
-      ['right bottom', {x: -10, y: 0, width: 20, height: 10}],
-    ].forEach(([transformOrigin, expectedBounds]) => {
-      it(`applies transformOrigin correctly for ${String(transformOrigin)}`, () => {
-        const root = Fantom.createRoot();
-
-        const viewRef = createRef<HostInstance>();
-        Fantom.runTask(() => {
-          root.render(
-            <View
-              ref={viewRef}
-              style={{
-                width: 10,
-                height: 10,
-                transform: [{scaleX: 2}],
-                transformOrigin,
-              }}
-            />,
-          );
-        });
-
-        const viewElement = ensureInstance(viewRef.current, ReactNativeElement);
-
-        const viewBounds = viewElement.getBoundingClientRect();
-        expect(viewBounds.x).toBe(expectedBounds.x);
-        expect(viewBounds.y).toBe(expectedBounds.y);
-        expect(viewBounds.width).toBe(expectedBounds.width);
-        expect(viewBounds.height).toBe(expectedBounds.height);
-      });
-    });
   });
 
   describe('props', () => {

packages/react-native/Libraries/Core/__tests__/ReactNativeVersionCheck-test.js

@@ -49,7 +49,6 @@ function _defineCheckVersionTests() {
     // $FlowFixMe[cannot-write]
     console.error = jest.fn();
     // $FlowFixMe[cannot-write]
-    // $FlowFixMe[unsafe-addition]
     global.console = {error: jest.fn(error => (consoleOutput += error))};
     spyOnConsoleError = jest.spyOn(global.console, 'error');
   });

packages/react-native/Libraries/Core/setUpPerformance.js

@@ -8,13 +8,12 @@
  * @format
  */
 
+import Performance from '../../src/private/webapis/performance/Performance';
 import NativePerformance from '../../src/private/webapis/performance/specs/NativePerformance';
 
 // In case if the native implementation of the Performance API is available, use it,
 // otherwise fall back to the legacy/default one, which only defines 'Performance.now()'
 if (NativePerformance) {
-  const Performance =
-    require('../../src/private/webapis/performance/Performance').default;
   // $FlowExpectedError[cannot-write]
   global.performance = new Performance();
 } else {

packages/react-native/Libraries/Interaction/InteractionManager.js

@@ -4,32 +4,180 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @flow strict
+ * @flow strict-local
  * @format
  */
 
 import type {EventSubscription} from '../vendor/emitter/EventEmitter';
+import type {Task} from './TaskQueue';
 
+import * as ReactNativeFeatureFlags from '../../src/private/featureflags/ReactNativeFeatureFlags';
+import EventEmitter from '../vendor/emitter/EventEmitter';
+
+const BatchedBridge = require('../BatchedBridge/BatchedBridge').default;
+const TaskQueue = require('./TaskQueue').default;
 const invariant = require('invariant');
 
-export type SimpleTask = {
-  name: string,
-  run: () => void,
-};
-export type PromiseTask = {
-  name: string,
-  gen: () => Promise<void>,
-};
-export type Task = SimpleTask | PromiseTask | (() => void);
+export type {Task, SimpleTask, PromiseTask} from './TaskQueue';
 
 export type Handle = number;
 
-// NOTE: The original implementation of `InteractionManager` never rejected
-// the returned promise. This preserves that behavior in the stub.
-function reject(error: Error): void {
-  setTimeout(() => {
-    throw error;
-  }, 0);
+const _emitter = new EventEmitter<{
+  interactionComplete: [],
+  interactionStart: [],
+}>();
+
+const DEBUG_DELAY: 0 = 0;
+const DEBUG: false = false;
+
+const InteractionManagerImpl = {
+  Events: {
+    interactionStart: 'interactionStart',
+    interactionComplete: 'interactionComplete',
+  },
+
+  /**
+   * Schedule a function to run after all interactions have completed. Returns a cancellable
+   * "promise".
+   */
+  runAfterInteractions(task: ?Task): {
+    then: <U>(
+      onFulfill?: ?(void) => ?(Promise<U> | U),
+      onReject?: ?(error: mixed) => ?(Promise<U> | U),
+    ) => Promise<U>,
+    cancel: () => void,
+    ...
+  } {
+    const tasks: Array<Task> = [];
+    const promise = new Promise((resolve: () => void) => {
+      _scheduleUpdate();
+      if (task) {
+        tasks.push(task);
+      }
+      tasks.push({
+        run: resolve,
+        name: 'resolve ' + ((task && task.name) || '?'),
+      });
+      _taskQueue.enqueueTasks(tasks);
+    });
+    return {
+      // $FlowFixMe[method-unbinding] added when improving typing for this parameters
+      then: promise.then.bind(promise),
+      cancel: function () {
+        _taskQueue.cancelTasks(tasks);
+      },
+    };
+  },
+
+  /**
+   * Notify manager that an interaction has started.
+   */
+  createInteractionHandle(): Handle {
+    /* $FlowFixMe[constant-condition] Error discovered during Constant
+     * Condition roll out. See https://fburl.com/workplace/1v97vimq. */
+    DEBUG && console.log('InteractionManager: create interaction handle');
+    _scheduleUpdate();
+    const handle = ++_inc;
+    _addInteractionSet.add(handle);
+    return handle;
+  },
+
+  /**
+   * Notify manager that an interaction has completed.
+   */
+  clearInteractionHandle(handle: Handle) {
+    /* $FlowFixMe[constant-condition] Error discovered during Constant
+     * Condition roll out. See https://fburl.com/workplace/1v97vimq. */
+    DEBUG && console.log('InteractionManager: clear interaction handle');
+    invariant(!!handle, 'InteractionManager: Must provide a handle to clear.');
+    _scheduleUpdate();
+    _addInteractionSet.delete(handle);
+    _deleteInteractionSet.add(handle);
+  },
+
+  // $FlowFixMe[unclear-type] unclear type of _emitter
+  // $FlowFixMe[method-unbinding] added when improving typing for this parameters
+  addListener: _emitter.addListener.bind(_emitter) as (
+    eventType: string,
+    // $FlowFixMe[unclear-type] unclear type of arguments
+    listener: (...args: any) => mixed,
+    context: mixed,
+  ) => EventSubscription,
+
+  /**
+   * A positive number will use setTimeout to schedule any tasks after the
+   * eventLoopRunningTime hits the deadline value, otherwise all tasks will be
+   * executed in one setImmediate batch (default).
+   */
+  setDeadline(deadline: number) {
+    _deadline = deadline;
+  },
+};
+
+const _interactionSet = new Set<number | Handle>();
+const _addInteractionSet = new Set<number | Handle>();
+const _deleteInteractionSet = new Set<Handle>();
+const _taskQueue = new TaskQueue({onMoreTasks: _scheduleUpdate});
+let _nextUpdateHandle: $FlowFixMe | TimeoutID = 0;
+let _inc = 0;
+let _deadline = -1;
+
+/**
+ * Schedule an asynchronous update to the interaction state.
+ */
+function _scheduleUpdate() {
+  if (!_nextUpdateHandle) {
+    if (_deadline > 0) {
+      _nextUpdateHandle = setTimeout(_processUpdate, 0 + DEBUG_DELAY);
+    } else {
+      _nextUpdateHandle = setImmediate(_processUpdate);
+    }
+  }
+}
+
+/**
+ * Notify listeners, process queue, etc
+ */
+function _processUpdate() {
+  _nextUpdateHandle = 0;
+
+  const interactionCount = _interactionSet.size;
+  _addInteractionSet.forEach(handle => _interactionSet.add(handle));
+  _deleteInteractionSet.forEach(handle => _interactionSet.delete(handle));
+  const nextInteractionCount = _interactionSet.size;
+
+  if (interactionCount !== 0 && nextInteractionCount === 0) {
+    // transition from 1+ --> 0 interactions
+    /* $FlowFixMe[prop-missing] Natural Inference rollout. See
+     * https://fburl.com/workplace/6291gfvu */
+    /* $FlowFixMe[invalid-computed-prop] Natural Inference rollout. See
+     * https://fburl.com/workplace/6291gfvu */
+    _emitter.emit(InteractionManager.Events.interactionComplete);
+  } else if (interactionCount === 0 && nextInteractionCount !== 0) {
+    // transition from 0 --> 1+ interactions
+    /* $FlowFixMe[prop-missing] Natural Inference rollout. See
+     * https://fburl.com/workplace/6291gfvu */
+    /* $FlowFixMe[invalid-computed-prop] Natural Inference rollout. See
+     * https://fburl.com/workplace/6291gfvu */
+    _emitter.emit(InteractionManager.Events.interactionStart);
+  }
+
+  // process the queue regardless of a transition
+  if (nextInteractionCount === 0) {
+    while (_taskQueue.hasTasksToProcess()) {
+      _taskQueue.processNext();
+      if (
+        _deadline > 0 &&
+        BatchedBridge.getEventLoopRunningTime() >= _deadline
+      ) {
+        // Hit deadline before processing all tasks, so process more later.
+        _scheduleUpdate();
+        break;
+      }
+    }
+  }
+  _addInteractionSet.clear();
+  _deleteInteractionSet.clear();
 }
 
 /**
@@ -83,106 +231,11 @@ function reject(error: Error): void {
  *
  * @deprecated
  */
-const InteractionManagerStub = {
-  Events: {
-    interactionStart: 'interactionStart',
-    interactionComplete: 'interactionComplete',
-  },
+const InteractionManager = (
+  ReactNativeFeatureFlags.disableInteractionManager()
+    ? // $FlowFixMe[incompatible-variance]
+      require('./InteractionManagerStub').default
+    : InteractionManagerImpl
+) as typeof InteractionManagerImpl;
 
-  /**
-   * Schedule a function to run after all interactions have completed. Returns a cancellable
-   * "promise".
-   *
-   * @deprecated
-   */
-  runAfterInteractions(task: ?Task): {
-    then: <U>(
-      onFulfill?: ?(void) => ?(Promise<U> | U),
-      onReject?: ?(error: mixed) => ?(Promise<U> | U),
-    ) => Promise<U>,
-    cancel: () => void,
-    ...
-  } {
-    let immediateID: ?$FlowIssue;
-    const promise = new Promise(resolve => {
-      immediateID = setImmediate(() => {
-        if (typeof task === 'object' && task !== null) {
-          if (typeof task.gen === 'function') {
-            task.gen().then(resolve, reject);
-          } else if (typeof task.run === 'function') {
-            try {
-              task.run();
-              resolve();
-            } catch (error) {
-              reject(error);
-            }
-          } else {
-            reject(new TypeError(`Task "${task.name}" missing gen or run.`));
-          }
-        } else if (typeof task === 'function') {
-          try {
-            task();
-            resolve();
-          } catch (error) {
-            reject(error);
-          }
-        } else {
-          reject(new TypeError('Invalid task of type: ' + typeof task));
-        }
-      });
-    });
-
-    return {
-      // $FlowFixMe[method-unbinding] added when improving typing for this parameters
-      then: promise.then.bind(promise),
-      cancel() {
-        clearImmediate(immediateID);
-      },
-    };
-  },
-
-  /**
-   * Notify manager that an interaction has started.
-   *
-   * @deprecated
-   */
-  createInteractionHandle(): Handle {
-    return -1;
-  },
-
-  /**
-   * Notify manager that an interaction has completed.
-   *
-   * @deprecated
-   */
-  clearInteractionHandle(handle: Handle) {
-    invariant(!!handle, 'InteractionManager: Must provide a handle to clear.');
-  },
-
-  /**
-   * @deprecated
-   */
-  addListener(
-    eventType: string,
-    // $FlowIgnore[unclear-type]
-    listener: (...args: any) => mixed,
-    context: mixed,
-  ): EventSubscription {
-    return {
-      remove() {},
-    };
-  },
-
-  /**
-   * A positive number will use setTimeout to schedule any tasks after the
-   * eventLoopRunningTime hits the deadline value, otherwise all tasks will be
-   * executed in one setImmediate batch (default).
-   *
-   * @deprecated
-   */
-  setDeadline(deadline: number) {
-    // Do nothing.
-  },
-};
-
-export default InteractionManagerStub;
+export default InteractionManager;

packages/react-native/Libraries/Interaction/InteractionManagerStub.js

@@ -0,0 +1,184 @@
+/**
+ * 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.
+ *
+ * @flow strict
+ * @format
+ */
+
+import type {EventSubscription} from '../vendor/emitter/EventEmitter';
+
+const invariant = require('invariant');
+
+export type Handle = number;
+
+type Task =
+  | {
+      name: string,
+      run: () => void,
+    }
+  | {
+      name: string,
+      gen: () => Promise<void>,
+    }
+  | (() => void);
+
+// NOTE: The original implementation of `InteractionManager` never rejected
+// the returned promise. This preserves that behavior in the stub.
+function reject(error: Error): void {
+  setTimeout(() => {
+    throw error;
+  }, 0);
+}
+
+/**
+ * InteractionManager allows long-running work to be scheduled after any
+ * interactions/animations have completed. In particular, this allows JavaScript
+ * animations to run smoothly.
+ *
+ * Applications can schedule tasks to run after interactions with the following:
+ *
+ * ```
+ * InteractionManager.runAfterInteractions(() => {
+ *   // ...long-running synchronous task...
+ * });
+ * ```
+ *
+ * Compare this to other scheduling alternatives:
+ *
+ * - requestAnimationFrame(): for code that animates a view over time.
+ * - setImmediate/setTimeout(): run code later, note this may delay animations.
+ * - runAfterInteractions(): run code later, without delaying active animations.
+ *
+ * The touch handling system considers one or more active touches to be an
+ * 'interaction' and will delay `runAfterInteractions()` callbacks until all
+ * touches have ended or been cancelled.
+ *
+ * InteractionManager also allows applications to register animations by
+ * creating an interaction 'handle' on animation start, and clearing it upon
+ * completion:
+ *
+ * ```
+ * var handle = InteractionManager.createInteractionHandle();
+ * // run animation... (`runAfterInteractions` tasks are queued)
+ * // later, on animation completion:
+ * InteractionManager.clearInteractionHandle(handle);
+ * // queued tasks run if all handles were cleared
+ * ```
+ *
+ * `runAfterInteractions` takes either a plain callback function, or a
+ * `PromiseTask` object with a `gen` method that returns a `Promise`.  If a
+ * `PromiseTask` is supplied, then it is fully resolved (including asynchronous
+ * dependencies that also schedule more tasks via `runAfterInteractions`) before
+ * starting on the next task that might have been queued up synchronously
+ * earlier.
+ *
+ * By default, queued tasks are executed together in a loop in one
+ * `setImmediate` batch. If `setDeadline` is called with a positive number, then
+ * tasks will only be executed until the deadline (in terms of js event loop run
+ * time) approaches, at which point execution will yield via setTimeout,
+ * allowing events such as touches to start interactions and block queued tasks
+ * from executing, making apps more responsive.
+ *
+ * @deprecated
+ */
+const InteractionManagerStub = {
+  Events: {
+    interactionStart: 'interactionStart',
+    interactionComplete: 'interactionComplete',
+  },
+
+  /**
+   * Schedule a function to run after all interactions have completed. Returns a cancellable
+   * "promise".
+   *
+   * @deprecated
+   */
+  runAfterInteractions(task: ?Task): {
+    then: <U>(
+      onFulfill?: ?(void) => ?(Promise<U> | U),
+      onReject?: ?(error: mixed) => ?(Promise<U> | U),
+    ) => Promise<U>,
+    cancel: () => void,
+    ...
+  } {
+    let immediateID: ?$FlowIssue;
+    const promise = new Promise(resolve => {
+      immediateID = setImmediate(() => {
+        if (typeof task === 'object' && task !== null) {
+          if (typeof task.gen === 'function') {
+            task.gen().then(resolve, reject);
+          } else if (typeof task.run === 'function') {
+            try {
+              task.run();
+              resolve();
+            } catch (error) {
+              reject(error);
+            }
+          } else {
+            reject(new TypeError(`Task "${task.name}" missing gen or run.`));
+          }
+        } else if (typeof task === 'function') {
+          try {
+            task();
+            resolve();
+          } catch (error) {
+            reject(error);
+          }
+        } else {
+          reject(new TypeError('Invalid task of type: ' + typeof task));
+        }
+      });
+    });
+
+    return {
+      // $FlowFixMe[method-unbinding] added when improving typing for this parameters
+      then: promise.then.bind(promise),
+      cancel() {
+        clearImmediate(immediateID);
+      },
+    };
+  },
+
+  /**
+   * Notify manager that an interaction has started.
+   *
+   * @deprecated
+   */
+  createInteractionHandle(): Handle {
+    return -1;
+  },
+
+  /**
+   * Notify manager that an interaction has completed.
+   *
+   * @deprecated
+   */
+  clearInteractionHandle(handle: Handle) {
+    invariant(!!handle, 'InteractionManager: Must provide a handle to clear.');
+  },
+
+  /**
+   * @deprecated
+   */
+  addListener(): EventSubscription {
+    return {
+      remove() {},
+    };
+  },
+
+  /**
+   * A positive number will use setTimeout to schedule any tasks after the
+   * eventLoopRunningTime hits the deadline value, otherwise all tasks will be
+   * executed in one setImmediate batch (default).
+   *
+   * @deprecated
+   */
+  setDeadline(deadline: number) {
+    // Do nothing.
+  },
+};
+
+export default InteractionManagerStub;

packages/react-native/Libraries/Interaction/TaskQueue.js

@@ -0,0 +1,197 @@
+/**
+ * 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.
+ *
+ * @flow strict
+ * @format
+ */
+
+'use strict';
+
+const invariant = require('invariant');
+
+export type SimpleTask = {
+  name: string,
+  run: () => void,
+};
+export type PromiseTask = {
+  name: string,
+  gen: () => Promise<void>,
+};
+export type Task = SimpleTask | PromiseTask | (() => void);
+
+const DEBUG: false = false;
+
+/**
+ * TaskQueue - A system for queueing and executing a mix of simple callbacks and
+ * trees of dependent tasks based on Promises. No tasks are executed unless
+ * `processNext` is called.
+ *
+ * `enqueue` takes a Task object with either a simple `run` callback, or a
+ * `gen` function that returns a `Promise` and puts it in the queue.  If a gen
+ * function is supplied, then the promise it returns will block execution of
+ * tasks already in the queue until it resolves. This can be used to make sure
+ * the first task is fully resolved (including asynchronous dependencies that
+ * also schedule more tasks via `enqueue`) before starting on the next task.
+ * The `onMoreTasks` constructor argument is used to inform the owner that an
+ * async task has resolved and that the queue should be processed again.
+ *
+ * Note: Tasks are only actually executed with explicit calls to `processNext`.
+ */
+class TaskQueue {
+  /**
+   * TaskQueue instances are self contained and independent, so multiple tasks
+   * of varying semantics and priority can operate together.
+   *
+   * `onMoreTasks` is invoked when `PromiseTask`s resolve if there are more
+   * tasks to process.
+   */
+  constructor({onMoreTasks}: {onMoreTasks: () => void, ...}) {
+    this._onMoreTasks = onMoreTasks;
+    this._queueStack = [{tasks: [], popable: false}];
+  }
+
+  /**
+   * Add a task to the queue.  It is recommended to name your tasks for easier
+   * async debugging. Tasks will not be executed until `processNext` is called
+   * explicitly.
+   */
+  enqueue(task: Task): void {
+    this._getCurrentQueue().push(task);
+  }
+
+  enqueueTasks(tasks: Array<Task>): void {
+    tasks.forEach(task => this.enqueue(task));
+  }
+
+  cancelTasks(tasksToCancel: Array<Task>): void {
+    // search through all tasks and remove them.
+    this._queueStack = this._queueStack
+      .map(queue => ({
+        ...queue,
+        tasks: queue.tasks.filter(task => tasksToCancel.indexOf(task) === -1),
+      }))
+      .filter((queue, idx) => queue.tasks.length > 0 || idx === 0);
+  }
+
+  /**
+   * Check to see if `processNext` should be called.
+   *
+   * @returns {boolean} Returns true if there are tasks that are ready to be
+   * processed with `processNext`, or returns false if there are no more tasks
+   * to be processed right now, although there may be tasks in the queue that
+   * are blocked by earlier `PromiseTask`s that haven't resolved yet.
+   * `onMoreTasks` will be called after each `PromiseTask` resolves if there are
+   * tasks ready to run at that point.
+   */
+  hasTasksToProcess(): boolean {
+    return this._getCurrentQueue().length > 0;
+  }
+
+  /**
+   * Executes the next task in the queue.
+   */
+  processNext(): void {
+    const queue = this._getCurrentQueue();
+    if (queue.length) {
+      const task = queue.shift();
+      try {
+        if (typeof task === 'object' && task.gen) {
+          /* $FlowFixMe[constant-condition] Error discovered during Constant
+           * Condition roll out. See https://fburl.com/workplace/1v97vimq. */
+          DEBUG && console.log('TaskQueue: genPromise for task ' + task.name);
+          this._genPromise(task);
+        } else if (typeof task === 'object' && task.run) {
+          /* $FlowFixMe[constant-condition] Error discovered during Constant
+           * Condition roll out. See https://fburl.com/workplace/1v97vimq. */
+          DEBUG && console.log('TaskQueue: run task ' + task.name);
+          task.run();
+        } else {
+          invariant(
+            typeof task === 'function',
+            'Expected Function, SimpleTask, or PromiseTask, but got:\n' +
+              JSON.stringify(task, null, 2),
+          );
+          /* $FlowFixMe[constant-condition] Error discovered during Constant
+           * Condition roll out. See https://fburl.com/workplace/1v97vimq. */
+          DEBUG && console.log('TaskQueue: run anonymous task');
+          task();
+        }
+      } catch (e) {
+        e.message =
+          // $FlowFixMe[incompatible-type]
+          // $FlowFixMe[incompatible-use]
+          'TaskQueue: Error with task ' + (task.name || '') + ': ' + e.message;
+        throw e;
+      }
+    }
+  }
+
+  _queueStack: Array<{
+    tasks: Array<Task>,
+    popable: boolean,
+    ...
+  }>;
+  _onMoreTasks: () => void;
+
+  _getCurrentQueue(): Array<Task> {
+    const stackIdx = this._queueStack.length - 1;
+    const queue = this._queueStack[stackIdx];
+    if (
+      queue.popable &&
+      queue.tasks.length === 0 &&
+      this._queueStack.length > 1
+    ) {
+      this._queueStack.pop();
+      /* $FlowFixMe[constant-condition] Error discovered during Constant
+       * Condition roll out. See https://fburl.com/workplace/1v97vimq. */
+      DEBUG &&
+        console.log('TaskQueue: popped queue: ', {
+          stackIdx,
+          queueStackSize: this._queueStack.length,
+        });
+      return this._getCurrentQueue();
+    } else {
+      return queue.tasks;
+    }
+  }
+
+  _genPromise(task: PromiseTask) {
+    // Each async task pushes it's own queue onto the queue stack. This
+    // effectively defers execution of previously queued tasks until the promise
+    // resolves, at which point we allow the new queue to be popped, which
+    // happens once it is fully processed.
+    this._queueStack.push({tasks: [], popable: false});
+    const stackIdx = this._queueStack.length - 1;
+    const stackItem = this._queueStack[stackIdx];
+    /* $FlowFixMe[constant-condition] Error discovered during Constant
+     * Condition roll out. See https://fburl.com/workplace/1v97vimq. */
+    DEBUG && console.log('TaskQueue: push new queue: ', {stackIdx});
+    /* $FlowFixMe[constant-condition] Error discovered during Constant
+     * Condition roll out. See https://fburl.com/workplace/1v97vimq. */
+    DEBUG && console.log('TaskQueue: exec gen task ' + task.name);
+    task
+      .gen()
+      .then(() => {
+        /* $FlowFixMe[constant-condition] Error discovered during Constant
+         * Condition roll out. See https://fburl.com/workplace/1v97vimq. */
+        DEBUG &&
+          console.log('TaskQueue: onThen for gen task ' + task.name, {
+            stackIdx,
+            queueStackSize: this._queueStack.length,
+          });
+        stackItem.popable = true;
+        this.hasTasksToProcess() && this._onMoreTasks();
+      })
+      .catch(ex => {
+        setTimeout(() => {
+          ex.message = `TaskQueue: Error resolving Promise in task ${task.name}: ${ex.message}`;
+          throw ex;
+        }, 0);
+      });
+  }
+}
+
+export default TaskQueue;

packages/react-native/Libraries/Interaction/__tests__/InteractionManager-test.js

@@ -0,0 +1,342 @@
+/**
+ * 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.
+ *
+ * @noflow
+ * @format
+ */
+
+'use strict';
+
+import type {ReactNativeFeatureFlagsJsOnlyOverrides} from '../../../src/private/featureflags/ReactNativeFeatureFlags';
+
+function importModules(overrides: ReactNativeFeatureFlagsJsOnlyOverrides) {
+  const ReactNativeFeatureFlags = require('../../../src/private/featureflags/ReactNativeFeatureFlags');
+
+  // Make sure to setup overrides before importing any modules.
+  ReactNativeFeatureFlags.override(overrides);
+
+  const BatchedBridge = require('../../BatchedBridge/BatchedBridge').default;
+  const InteractionManager = require('../InteractionManager').default;
+
+  jest.mock('../../vendor/core/ErrorUtils');
+  jest.mock('../../BatchedBridge/BatchedBridge');
+
+  return {
+    BatchedBridge,
+    InteractionManager,
+  };
+}
+
+const isWindows = process.platform === 'win32';
+const itif = (condition: boolean) => (condition ? it : it.skip);
+
+function expectToBeCalledOnce(
+  fn: JestMockFn<$ReadOnlyArray<mixed>, mixed>,
+): void {
+  expect(fn.mock.calls.length).toBe(1);
+}
+
+describe('InteractionManager', () => {
+  let InteractionManager;
+  let interactionStart;
+  let interactionComplete;
+
+  beforeEach(() => {
+    jest.resetModules();
+    ({InteractionManager} = importModules({
+      disableInteractionManager: () => false,
+    }));
+
+    interactionStart = jest.fn();
+    interactionComplete = jest.fn();
+
+    InteractionManager.addListener(
+      InteractionManager.Events.interactionStart,
+      interactionStart,
+    );
+    InteractionManager.addListener(
+      InteractionManager.Events.interactionComplete,
+      interactionComplete,
+    );
+  });
+
+  it('throws when clearing an undefined handle', () => {
+    // $FlowExpectedError[incompatible-call]
+    expect(() => InteractionManager.clearInteractionHandle()).toThrow();
+  });
+
+  it('notifies asynchronously when interaction starts', () => {
+    InteractionManager.createInteractionHandle();
+    expect(interactionStart).not.toBeCalled();
+
+    jest.runAllTimers();
+    expect(interactionStart).toBeCalled();
+    expect(interactionComplete).not.toBeCalled();
+  });
+
+  it('notifies asynchronously when interaction stops', () => {
+    const handle = InteractionManager.createInteractionHandle();
+    jest.runAllTimers();
+    interactionStart.mockClear();
+    InteractionManager.clearInteractionHandle(handle);
+    expect(interactionComplete).not.toBeCalled();
+
+    jest.runAllTimers();
+    expect(interactionStart).not.toBeCalled();
+    expect(interactionComplete).toBeCalled();
+  });
+
+  it('does not notify when started & stopped in same event loop', () => {
+    const handle = InteractionManager.createInteractionHandle();
+    InteractionManager.clearInteractionHandle(handle);
+
+    jest.runAllTimers();
+    expect(interactionStart).not.toBeCalled();
+    expect(interactionComplete).not.toBeCalled();
+  });
+
+  it('does not notify when going from two -> one active interactions', () => {
+    InteractionManager.createInteractionHandle();
+    const handle = InteractionManager.createInteractionHandle();
+    jest.runAllTimers();
+
+    interactionStart.mockClear();
+    interactionComplete.mockClear();
+
+    InteractionManager.clearInteractionHandle(handle);
+    jest.runAllTimers();
+    expect(interactionStart).not.toBeCalled();
+    expect(interactionComplete).not.toBeCalled();
+  });
+
+  it('runs tasks asynchronously when there are interactions', () => {
+    const task = jest.fn();
+    InteractionManager.runAfterInteractions(task);
+    expect(task).not.toBeCalled();
+
+    jest.runAllTimers();
+    expect(task).toBeCalled();
+  });
+
+  it('runs tasks when interactions complete', () => {
+    const task = jest.fn();
+    const handle = InteractionManager.createInteractionHandle();
+    InteractionManager.runAfterInteractions(task);
+
+    jest.runAllTimers();
+    InteractionManager.clearInteractionHandle(handle);
+    expect(task).not.toBeCalled();
+
+    jest.runAllTimers();
+    expect(task).toBeCalled();
+  });
+
+  it('does not run tasks twice', () => {
+    const task1 = jest.fn();
+    const task2 = jest.fn();
+    InteractionManager.runAfterInteractions(task1);
+    jest.runAllTimers();
+
+    InteractionManager.runAfterInteractions(task2);
+    jest.runAllTimers();
+
+    expectToBeCalledOnce(task1);
+  });
+
+  it('runs tasks added while processing previous tasks', () => {
+    const task1 = jest.fn(() => {
+      InteractionManager.runAfterInteractions(task2);
+    });
+    const task2 = jest.fn();
+
+    InteractionManager.runAfterInteractions(task1);
+    expect(task2).not.toBeCalled();
+
+    jest.runAllTimers();
+
+    expect(task1).toBeCalled();
+    expect(task2).toBeCalled();
+  });
+
+  it('allows tasks to be cancelled', () => {
+    const task1 = jest.fn();
+    const task2 = jest.fn();
+    const promise1 = InteractionManager.runAfterInteractions(task1);
+    InteractionManager.runAfterInteractions(task2);
+    expect(task1).not.toBeCalled();
+    expect(task2).not.toBeCalled();
+    promise1.cancel();
+
+    jest.runAllTimers();
+    expect(task1).not.toBeCalled();
+    expect(task2).toBeCalled();
+  });
+});
+
+describe('promise tasks', () => {
+  let BatchedBridge;
+  let InteractionManager;
+  let sequenceId;
+
+  function createSequenceTask(expectedSequenceId: number) {
+    return jest.fn(() => {
+      expect(++sequenceId).toBe(expectedSequenceId);
+    });
+  }
+
+  beforeEach(() => {
+    jest.resetModules();
+
+    ({BatchedBridge, InteractionManager} = importModules({
+      disableInteractionManager: () => false,
+    }));
+
+    sequenceId = 0;
+  });
+
+  it('should run a basic promise task', () => {
+    const task1 = jest.fn(() => {
+      expect(++sequenceId).toBe(1);
+      return new Promise(resolve => resolve());
+    });
+    InteractionManager.runAfterInteractions({gen: task1, name: 'gen1'});
+    jest.runAllTimers();
+    expectToBeCalledOnce(task1);
+  });
+
+  it('should handle nested promises', () => {
+    const task1 = jest.fn(() => {
+      expect(++sequenceId).toBe(1);
+      return new Promise(resolve => {
+        InteractionManager.runAfterInteractions({
+          gen: task2,
+          name: 'gen2',
+        }).then(resolve);
+      });
+    });
+    const task2 = jest.fn(() => {
+      expect(++sequenceId).toBe(2);
+      return new Promise(resolve => resolve());
+    });
+    InteractionManager.runAfterInteractions({gen: task1, name: 'gen1'});
+    jest.runAllTimers();
+    expectToBeCalledOnce(task1);
+    expectToBeCalledOnce(task2);
+  });
+
+  it('should pause promise tasks during interactions then resume', () => {
+    const task1 = createSequenceTask(1);
+    const task2 = jest.fn(() => {
+      expect(++sequenceId).toBe(2);
+      return new Promise(resolve => {
+        setTimeout(() => {
+          InteractionManager.runAfterInteractions(task3).then(resolve);
+        }, 1);
+      });
+    });
+    const task3 = createSequenceTask(3);
+    InteractionManager.runAfterInteractions(task1);
+    InteractionManager.runAfterInteractions({gen: task2, name: 'gen2'});
+    jest.runOnlyPendingTimers();
+    expectToBeCalledOnce(task1);
+    expectToBeCalledOnce(task2);
+    const handle = InteractionManager.createInteractionHandle();
+    jest.runAllTimers();
+    jest.runAllTimers(); // Just to be sure...
+    expect(task3).not.toBeCalled();
+    InteractionManager.clearInteractionHandle(handle);
+    jest.runAllTimers();
+    expectToBeCalledOnce(task3);
+  });
+
+  it('should execute tasks in loop within deadline', () => {
+    InteractionManager.setDeadline(100);
+    BatchedBridge.getEventLoopRunningTime.mockReturnValue(10);
+    const task1 = createSequenceTask(1);
+    const task2 = createSequenceTask(2);
+    InteractionManager.runAfterInteractions(task1);
+    InteractionManager.runAfterInteractions(task2);
+
+    jest.runOnlyPendingTimers();
+
+    expectToBeCalledOnce(task1);
+    expectToBeCalledOnce(task2);
+  });
+
+  it('should execute tasks one at a time if deadline exceeded', () => {
+    InteractionManager.setDeadline(100);
+    BatchedBridge.getEventLoopRunningTime.mockReturnValue(200);
+    const task1 = createSequenceTask(1);
+    const task2 = createSequenceTask(2);
+    InteractionManager.runAfterInteractions(task1);
+    InteractionManager.runAfterInteractions(task2);
+
+    jest.runOnlyPendingTimers();
+
+    expectToBeCalledOnce(task1);
+    expect(task2).not.toBeCalled();
+
+    jest.runOnlyPendingTimers(); // resolve1
+    jest.runOnlyPendingTimers(); // task2
+
+    expectToBeCalledOnce(task2);
+  });
+
+  const bigAsyncTest = resolveTest => {
+    jest.useRealTimers();
+
+    const task1 = createSequenceTask(1);
+    const task2 = jest.fn(() => {
+      expect(++sequenceId).toBe(2);
+      return new Promise(resolve => {
+        InteractionManager.runAfterInteractions(task3);
+        setTimeout(() => {
+          InteractionManager.runAfterInteractions({
+            gen: task4,
+            name: 'gen4',
+          }).then(resolve);
+        }, 1);
+      });
+    });
+    const task3 = createSequenceTask(3);
+    const task4 = jest.fn(() => {
+      expect(++sequenceId).toBe(4);
+      return new Promise(resolve => {
+        InteractionManager.runAfterInteractions(task5).then(resolve);
+      });
+    });
+    const task5 = createSequenceTask(5);
+    const task6 = createSequenceTask(6);
+
+    InteractionManager.runAfterInteractions(task1);
+    InteractionManager.runAfterInteractions({gen: task2, name: 'gen2'});
+    InteractionManager.runAfterInteractions(task6);
+
+    setTimeout(() => {
+      expectToBeCalledOnce(task1);
+      expectToBeCalledOnce(task2);
+      expectToBeCalledOnce(task3);
+      expectToBeCalledOnce(task4);
+      expectToBeCalledOnce(task5);
+      expectToBeCalledOnce(task6);
+
+      resolveTest();
+    }, 100);
+  };
+
+  itif(!isWindows)(
+    'resolves async tasks recursively before other queued tasks',
+    () => {
+      return new Promise(bigAsyncTest);
+    },
+  );
+
+  itif(!isWindows)('should also work with a deadline', () => {
+    InteractionManager.setDeadline(100);
+    BatchedBridge.getEventLoopRunningTime.mockReturnValue(200);
+    return new Promise(bigAsyncTest);
+  });
+});

packages/react-native/Libraries/Interaction/__tests__/TaskQueue-test.js

@@ -0,0 +1,169 @@
+/**
+ * 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.
+ *
+ * @noflow
+ * @format
+ */
+
+'use strict';
+
+const Promise = require('promise');
+
+function expectToBeCalledOnce(fn) {
+  expect(fn.mock.calls.length).toBe(1);
+}
+
+function clearTaskQueue(taskQueue) {
+  do {
+    jest.runAllTimers();
+    taskQueue.processNext();
+    jest.runAllTimers();
+  } while (taskQueue.hasTasksToProcess());
+}
+
+describe('TaskQueue', () => {
+  let taskQueue;
+  let onMoreTasks;
+  let sequenceId;
+  function createSequenceTask(expectedSequenceId) {
+    return jest.fn(() => {
+      expect(++sequenceId).toBe(expectedSequenceId);
+    });
+  }
+  beforeEach(() => {
+    jest.resetModules();
+    onMoreTasks = jest.fn();
+    const TaskQueue = require('../TaskQueue').default;
+    taskQueue = new TaskQueue({onMoreTasks});
+    sequenceId = 0;
+  });
+
+  it('should run a basic task', () => {
+    const task1 = createSequenceTask(1);
+    taskQueue.enqueue({run: task1, name: 'run1'});
+    expect(taskQueue.hasTasksToProcess()).toBe(true);
+    taskQueue.processNext();
+    expectToBeCalledOnce(task1);
+  });
+
+  it('should handle blocking promise task', () => {
+    const task1 = jest.fn(() => {
+      return new Promise(resolve => {
+        setTimeout(() => {
+          expect(++sequenceId).toBe(1);
+          resolve();
+        }, 1);
+      });
+    });
+    const task2 = createSequenceTask(2);
+    taskQueue.enqueue({gen: task1, name: 'gen1'});
+    taskQueue.enqueue({run: task2, name: 'run2'});
+
+    taskQueue.processNext();
+
+    expectToBeCalledOnce(task1);
+    expect(task2).not.toBeCalled();
+    expect(onMoreTasks).not.toBeCalled();
+    expect(taskQueue.hasTasksToProcess()).toBe(false);
+
+    clearTaskQueue(taskQueue);
+
+    expectToBeCalledOnce(onMoreTasks);
+    expectToBeCalledOnce(task2);
+  });
+
+  it('should handle nested simple tasks', () => {
+    const task1 = jest.fn(() => {
+      expect(++sequenceId).toBe(1);
+      taskQueue.enqueue({run: task3, name: 'run3'});
+    });
+    const task2 = createSequenceTask(2);
+    const task3 = createSequenceTask(3);
+    taskQueue.enqueue({run: task1, name: 'run1'});
+    taskQueue.enqueue({run: task2, name: 'run2'}); // not blocked by task 1
+
+    clearTaskQueue(taskQueue);
+
+    expectToBeCalledOnce(task1);
+    expectToBeCalledOnce(task2);
+    expectToBeCalledOnce(task3);
+  });
+
+  it('should handle nested promises', () => {
+    const task1 = jest.fn(() => {
+      return new Promise(resolve => {
+        setTimeout(() => {
+          expect(++sequenceId).toBe(1);
+          taskQueue.enqueue({gen: task2, name: 'gen2'});
+          taskQueue.enqueue({run: resolve, name: 'resolve1'});
+        }, 1);
+      });
+    });
+    const task2 = jest.fn(() => {
+      return new Promise(resolve => {
+        setTimeout(() => {
+          expect(++sequenceId).toBe(2);
+          taskQueue.enqueue({run: task3, name: 'run3'});
+          taskQueue.enqueue({run: resolve, name: 'resolve2'});
+        }, 1);
+      });
+    });
+    const task3 = createSequenceTask(3);
+    const task4 = createSequenceTask(4);
+    taskQueue.enqueue({gen: task1, name: 'gen1'});
+    taskQueue.enqueue({run: task4, name: 'run4'}); // blocked by task 1 promise
+
+    clearTaskQueue(taskQueue);
+
+    expectToBeCalledOnce(task1);
+    expectToBeCalledOnce(task2);
+    expectToBeCalledOnce(task3);
+    expectToBeCalledOnce(task4);
+  });
+
+  it('should be able to cancel tasks', () => {
+    const task1 = jest.fn();
+    const task2 = createSequenceTask(1);
+    const task3 = jest.fn();
+    const task4 = createSequenceTask(2);
+    taskQueue.enqueue(task1);
+    taskQueue.enqueue(task2);
+    taskQueue.enqueue(task3);
+    taskQueue.enqueue(task4);
+    taskQueue.cancelTasks([task1, task3]);
+    clearTaskQueue(taskQueue);
+    expect(task1).not.toBeCalled();
+    expect(task3).not.toBeCalled();
+    expectToBeCalledOnce(task2);
+    expectToBeCalledOnce(task4);
+    expect(taskQueue.hasTasksToProcess()).toBe(false);
+  });
+
+  it('should not crash when last task is cancelled', () => {
+    const task1 = jest.fn();
+    taskQueue.enqueue(task1);
+    taskQueue.cancelTasks([task1]);
+    clearTaskQueue(taskQueue);
+    expect(task1).not.toBeCalled();
+    expect(taskQueue.hasTasksToProcess()).toBe(false);
+  });
+
+  it('should not crash when task is cancelled between being started and resolved', () => {
+    const task1 = jest.fn(() => {
+      return new Promise(resolve => {
+        setTimeout(() => {
+          resolve();
+        }, 1);
+      });
+    });
+
+    taskQueue.enqueue({gen: task1, name: 'gen1'});
+    taskQueue.processNext();
+    taskQueue.cancelTasks([task1]);
+
+    jest.runAllTimers();
+  });
+});

packages/react-native/Libraries/Network/XMLHttpRequest.js

@@ -400,6 +400,7 @@ class XMLHttpRequest extends EventTarget {
     if (XMLHttpRequest._profiling) {
       console.timeStamp(
         'Incremental Data: ' + this._getMeasureURL(),
+        // $FlowFixMe[extra-arg] Add correct typing for `console.timeStamp`
         start,
         undefined,
         PERFORMANCE_TRACK_NAME,
@@ -454,6 +455,7 @@ class XMLHttpRequest extends EventTarget {
         const start = this._startTime;
         console.timeStamp(
           this._getMeasureURL(),
+          // $FlowFixMe[extra-arg] Add correct typing for `console.timeStamp`
           start,
           undefined,
           PERFORMANCE_TRACK_NAME,

packages/react-native/Libraries/promiseRejectionTrackingOptions.js

@@ -10,21 +10,21 @@
 
 import typeof {enable} from 'promise/setimmediate/rejection-tracking';
 
-import ExceptionsManager from './Core/ExceptionsManager';
+import LogBox from './LogBox/LogBox';
 
 let rejectionTrackingOptions: $NonMaybeType<Parameters<enable>[0]> = {
   allRejections: true,
-  onUnhandled: (id, rejection) => {
+  onUnhandled: (id, rejection = {}) => {
     let message: string;
+    let stack: ?string;
 
-    if (rejection === undefined) {
-      message = '';
-    } else if (
-      // $FlowFixMe[method-unbinding] added when improving typing for this parameters
-      Object.prototype.toString.call(rejection) === '[object Error]'
-    ) {
+    // $FlowFixMe[method-unbinding] added when improving typing for this parameters
+    const stringValue = Object.prototype.toString.call(rejection);
+    if (stringValue === '[object Error]') {
       // $FlowFixMe[method-unbinding] added when improving typing for this parameters
       message = Error.prototype.toString.call(rejection);
+      const error: Error = (rejection: $FlowFixMe);
+      stack = error.stack;
     } else {
       try {
         message = require('pretty-format').format(rejection);
@@ -34,23 +34,37 @@ let rejectionTrackingOptions: $NonMaybeType<Parameters<enable>[0]> = {
             ? rejection
             : JSON.stringify((rejection: $FlowFixMe));
       }
+      // It could although this object is not a standard error, it still has stack information to unwind
+      // $FlowFixMe ignore types just check if stack is there
+      if (rejection?.stack && typeof rejection.stack === 'string') {
+        stack = rejection.stack;
+      }
     }
 
-    ExceptionsManager.handleException(
-      new Error(
-        `Uncaught (in promise, id: ${id})${message ? `: "${message}"` : ''}`,
-        {
-          cause: rejection,
+    const warning = `Possible unhandled promise rejection (id: ${id}):\n${
+      message ?? ''
+    }`;
+    if (__DEV__) {
+      LogBox.addLog({
+        level: 'warn',
+        message: {
+          content: warning,
+          substitutions: [],
         },
-      ),
-      false /* isFatal */,
-    );
+        componentStack: [],
+        componentStackType: null,
+        stack,
+        category: 'possible_unhandled_promise_rejection',
+      });
+    } else {
+      console.warn(warning);
+    }
   },
   onHandled: id => {
     const warning =
       `Promise rejection handled (id: ${id})\n` +
       'This means you can ignore any previous messages of the form ' +
-      `"Uncaught (in promise, id: ${id})"`;
+      `"Possible unhandled promise rejection (id: ${id}):"`;
     console.warn(warning);
   },
 };

packages/react-native/React/Fabric/Mounting/ComponentViews/ScrollView/RCTPullToRefreshViewComponentView.mm

@@ -24,13 +24,9 @@ using namespace facebook::react;
 @end
 
 @implementation RCTPullToRefreshViewComponentView {
+  BOOL _isBeforeInitialLayout;
   UIRefreshControl *_refreshControl;
   RCTScrollViewComponentView *__weak _scrollViewComponentView;
-  // This variable keeps track of whether the view is recycled or not. Once the view is recycled, the component
-  // creates a new instance of UIRefreshControl, resetting the native props to the default values.
-  // However, when recycling, we are keeping around the old _props. The flag is used to force the application
-  // of the current props to the newly created UIRefreshControl the first time that updateProps is called.
-  BOOL _recycled;
 }
 
 - (instancetype)initWithFrame:(CGRect)frame
@@ -40,7 +36,8 @@ using namespace facebook::react;
     // attaching and detaching of a pull-to-refresh view to a scroll view.
     // The pull-to-refresh view is not a subview of this view.
     self.hidden = YES;
-    _recycled = NO;
+
+    _isBeforeInitialLayout = YES;
     [self _initializeUIRefreshControl];
   }
 
@@ -66,53 +63,54 @@ using namespace facebook::react;
 {
   [super prepareForRecycle];
   _scrollViewComponentView = nil;
+  _props = nil;
+  _isBeforeInitialLayout = YES;
   [self _initializeUIRefreshControl];
-  _recycled = YES;
 }
 
 - (void)updateProps:(const Props::Shared &)props oldProps:(const Props::Shared &)oldProps
 {
+  // Prop updates are ignored by _refreshControl until after the initial layout, so just store them in _props until then
+  if (_isBeforeInitialLayout) {
+    _props = std::static_pointer_cast<const PullToRefreshViewProps>(props);
+    return;
+  }
+
   const auto &oldConcreteProps = static_cast<const PullToRefreshViewProps &>(*_props);
   const auto &newConcreteProps = static_cast<const PullToRefreshViewProps &>(*props);
 
-  if (_recycled || newConcreteProps.tintColor != oldConcreteProps.tintColor) {
+  if (newConcreteProps.tintColor != oldConcreteProps.tintColor) {
     _refreshControl.tintColor = RCTUIColorFromSharedColor(newConcreteProps.tintColor);
   }
 
-  if (_recycled || newConcreteProps.progressViewOffset != oldConcreteProps.progressViewOffset) {
+  if (newConcreteProps.progressViewOffset != oldConcreteProps.progressViewOffset) {
     [self _updateProgressViewOffset:newConcreteProps.progressViewOffset];
   }
 
   BOOL needsUpdateTitle = NO;
 
-  if (_recycled || newConcreteProps.title != oldConcreteProps.title) {
+  if (newConcreteProps.title != oldConcreteProps.title) {
     needsUpdateTitle = YES;
   }
 
-  if (_recycled || newConcreteProps.titleColor != oldConcreteProps.titleColor) {
+  if (newConcreteProps.titleColor != oldConcreteProps.titleColor) {
     needsUpdateTitle = YES;
   }
 
   [super updateProps:props oldProps:oldProps];
 
-  if (_recycled || needsUpdateTitle) {
+  if (needsUpdateTitle) {
     [self _updateTitle];
   }
 
   // All prop updates must happen above the call to begin refreshing, or else _refreshControl will ignore the updates
-  if (_recycled || newConcreteProps.refreshing != oldConcreteProps.refreshing) {
+  if (newConcreteProps.refreshing != oldConcreteProps.refreshing) {
     if (newConcreteProps.refreshing) {
       [self beginRefreshingProgrammatically];
     } else {
       [_refreshControl endRefreshing];
     }
   }
-
-  if (_recycled || newConcreteProps.zIndex != oldConcreteProps.zIndex) {
-    _refreshControl.layer.zPosition = newConcreteProps.zIndex.value_or(0);
-  }
-
-  _recycled = NO;
 }
 
 #pragma mark -
@@ -157,12 +155,10 @@ using namespace facebook::react;
 
   // Attempts to begin refreshing before the initial layout are ignored by _refreshControl. So if the control is
   // refreshing when mounted, we need to call beginRefreshing in layoutSubviews or it won't work.
-  if (self.window) {
-    const auto &concreteProps = static_cast<const PullToRefreshViewProps &>(*_props);
+  if (_isBeforeInitialLayout) {
+    _isBeforeInitialLayout = NO;
 
-    if (concreteProps.refreshing) {
-      [self beginRefreshingProgrammatically];
-    }
+    [self updateProps:_props oldProps:PullToRefreshViewShadowNode::defaultSharedProps()];
   }
 }
 
@@ -218,12 +214,11 @@ using namespace facebook::react;
 
   // When refreshing programmatically (i.e. without pulling down), we must explicitly adjust the ScrollView content
   // offset, or else the _refreshControl won't be visible
-  if (!_refreshControl.isRefreshing) {
-    UIScrollView *scrollView = _scrollViewComponentView.scrollView;
-    CGPoint offset = {scrollView.contentOffset.x, scrollView.contentOffset.y - _refreshControl.frame.size.height};
-    [scrollView setContentOffset:offset];
-    [_refreshControl beginRefreshing];
-  }
+  UIScrollView *scrollView = _scrollViewComponentView.scrollView;
+  CGPoint offset = {scrollView.contentOffset.x, scrollView.contentOffset.y - _refreshControl.frame.size.height};
+  [scrollView setContentOffset:offset];
+
+  [_refreshControl beginRefreshing];
 }
 
 #pragma mark - Native commands

packages/react-native/React/Fabric/Mounting/ComponentViews/ScrollView/RCTScrollViewComponentView.mm

@@ -112,11 +112,6 @@ RCTSendScrollEventForNativeAnimations_DEPRECATED(UIScrollView *scrollView, NSInt
   __weak UIView *_firstVisibleView;
 
   CGFloat _endDraggingSensitivityMultiplier;
-
-  // A flag indicating that accessibility API is used.
-  // It is not restored to the default value in prepareForRecycle.
-  // Once an accessibility API is used, view culling will be disabled for the entire session.
-  BOOL _isAccessibilityAPIUsed;
 }
 
 + (RCTScrollViewComponentView *_Nullable)findScrollViewComponentViewForView:(UIView *)view
@@ -139,7 +134,6 @@ RCTSendScrollEventForNativeAnimations_DEPRECATED(UIScrollView *scrollView, NSInt
     _isUserTriggeredScrolling = NO;
     _shouldUpdateContentInsetAdjustmentBehavior = YES;
     _automaticallyAdjustKeyboardInsets = NO;
-    _isAccessibilityAPIUsed = NO;
     [self addSubview:_scrollView];
 
     _containerView = [[UIView alloc] initWithFrame:CGRectZero];
@@ -599,38 +593,6 @@ static inline UIViewAnimationOptions animationOptionsWithCurve(UIViewAnimationCu
   return metrics;
 }
 
-/**
- * When use of accessibility APIs is detected, view culling is disabled to make accessibility work correctly.
- */
-- (void)_disableViewCullingIfNecessary
-{
-  if (!_isAccessibilityAPIUsed) {
-    _isAccessibilityAPIUsed = YES;
-    [self _updateStateWithContentOffset];
-  }
-}
-
-- (NSInteger)accessibilityElementCount
-{
-  // From empirical testing, method `accessibilityElementCount` is called lazily only
-  // when accessibility is used.
-  // Why we don't use UIAccessibilitySwitchControlStatusDidChangeNotification and
-  // UIAccessibilityVoiceOverStatusDidChangeNotification? The notifications are not called when using Accessibility
-  // Inspector. We anticipate developers will want to debug accessbility with Accessibility Inspector and don't want to
-  // break that developer workflow with view culling. Therefore, we are using API use detection to disable view culling
-  // instead of the notifications.
-  [self _disableViewCullingIfNecessary];
-  return [super accessibilityElementCount];
-}
-
-- (NSArray<id<UIFocusItem>> *)focusItemsInRect:(CGRect)rect
-{
-  // From empirical testing, method `focusItemsInRect:` is called lazily only
-  // when keyboard navigation is used.
-  [self _disableViewCullingIfNecessary];
-  return [super focusItemsInRect:rect];
-}
-
 - (void)_updateStateWithContentOffset
 {
   if (!_state) {
@@ -638,23 +600,17 @@ static inline UIViewAnimationOptions animationOptionsWithCurve(UIViewAnimationCu
   }
 
   auto contentOffset = RCTPointFromCGPoint(_scrollView.contentOffset);
-  BOOL isAccessibilityAPIUsed = _isAccessibilityAPIUsed;
   _state->updateState(
-      [contentOffset, isAccessibilityAPIUsed](
+      [contentOffset](
           const ScrollViewShadowNode::ConcreteState::Data &oldData) -> ScrollViewShadowNode::ConcreteState::SharedData {
-        if (oldData.contentOffset == contentOffset && oldData.disableViewCulling == isAccessibilityAPIUsed) {
-          // avoid doing a state update if content offset and use of accessibility didn't change.
+        if (oldData.contentOffset == contentOffset) {
+          // avoid doing a state update if content offset didn't change.
           return nullptr;
         }
         auto newData = oldData;
         newData.contentOffset = contentOffset;
-        newData.disableViewCulling =
-            UIAccessibilityIsVoiceOverRunning() || UIAccessibilityIsSwitchControlRunning() || isAccessibilityAPIUsed;
         return std::make_shared<const ScrollViewShadowNode::ConcreteState::Data>(newData);
-      },
-      ReactNativeFeatureFlags::enableImmediateUpdateModeForContentOffsetChanges()
-          ? EventQueue::UpdateMode::unstable_Immediate
-          : EventQueue::UpdateMode::Asynchronous);
+      });
 }
 
 - (void)prepareForRecycle

packages/react-native/React/Fabric/Mounting/ComponentViews/Text/RCTParagraphComponentView.mm

@@ -9,6 +9,7 @@
 #import "RCTParagraphComponentAccessibilityProvider.h"
 
 #import <MobileCoreServices/UTCoreTypes.h>
+#import <React/RCTViewAccessibilityElement.h>
 #import <react/renderer/components/text/ParagraphComponentDescriptor.h>
 #import <react/renderer/components/text/ParagraphProps.h>
 #import <react/renderer/components/text/ParagraphState.h>
@@ -226,6 +227,10 @@ using namespace facebook::react;
         for (NSObject *element in elements) {
           if ([element isKindOfClass:[UIView class]] && [cooptingCandidates containsObject:((UIView *)element)]) {
             return YES;
+          } else if (
+              [element isKindOfClass:[RCTViewAccessibilityElement class]] &&
+              [cooptingCandidates containsObject:((RCTViewAccessibilityElement *)element).view]) {
+            return YES;
           }
         }
       }

packages/react-native/React/Fabric/Mounting/ComponentViews/View/RCTViewAccessibilityElement.h

@@ -0,0 +1,28 @@
+/*
+ * 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 "RCTViewComponentView.h"
+
+#import <UIKit/UIKit.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+/*
+ * A UIAcccessibilityElement representing a RCTViewComponentView from an
+ * accessibility standpoint. This enables RCTViewComponentView's to reference
+ * themselves in `accessibilityElements` without actually being an accessibility
+ * element. If it were, then iOS would not call into `accessibilityElements`.
+ */
+@interface RCTViewAccessibilityElement : UIAccessibilityElement
+
+@property (readonly) RCTViewComponentView *view;
+
+- (instancetype)initWithView:(RCTViewComponentView *)view;
+
+@end
+
+NS_ASSUME_NONNULL_END

packages/react-native/React/Fabric/Mounting/ComponentViews/View/RCTViewAccessibilityElement.mm

@@ -0,0 +1,83 @@
+/*
+ * 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 "RCTViewAccessibilityElement.h"
+
+@implementation RCTViewAccessibilityElement
+
+- (instancetype)initWithView:(RCTViewComponentView *)view
+{
+  if (self = [super initWithAccessibilityContainer:view]) {
+    _view = view;
+  }
+
+  return self;
+}
+
+- (CGRect)accessibilityFrame
+{
+  return UIAccessibilityConvertFrameToScreenCoordinates(_view.bounds, _view);
+}
+
+#pragma mark - Forwarding to _view
+
+- (NSString *)accessibilityLabel
+{
+  return _view.accessibilityLabel;
+}
+
+- (NSString *)accessibilityValue
+{
+  return _view.accessibilityValue;
+}
+
+- (UIAccessibilityTraits)accessibilityTraits
+{
+  return _view.accessibilityTraits;
+}
+
+- (NSString *)accessibilityHint
+{
+  return _view.accessibilityHint;
+}
+
+- (BOOL)accessibilityIgnoresInvertColors
+{
+  return _view.accessibilityIgnoresInvertColors;
+}
+
+- (BOOL)shouldGroupAccessibilityChildren
+{
+  return _view.shouldGroupAccessibilityChildren;
+}
+
+- (NSArray<UIAccessibilityCustomAction *> *)accessibilityCustomActions
+{
+  return _view.accessibilityCustomActions;
+}
+
+- (NSString *)accessibilityLanguage
+{
+  return _view.accessibilityLanguage;
+}
+
+- (BOOL)accessibilityViewIsModal
+{
+  return _view.accessibilityViewIsModal;
+}
+
+- (BOOL)accessibilityElementsHidden
+{
+  return _view.accessibilityElementsHidden;
+}
+
+- (BOOL)accessibilityRespondsToUserInteraction
+{
+  return _view.accessibilityRespondsToUserInteraction;
+}
+
+@end

packages/react-native/React/Fabric/Mounting/ComponentViews/View/RCTViewComponentView.mm

@@ -6,6 +6,7 @@
  */
 
 #import "RCTViewComponentView.h"
+#import "RCTViewAccessibilityElement.h"
 
 #import <CoreGraphics/CoreGraphics.h>
 #import <QuartzCore/QuartzCore.h>
@@ -50,6 +51,8 @@ const CGFloat BACKGROUND_COLOR_ZPOSITION = -1024.0f;
   UIView *_containerView;
   BOOL _useCustomContainerView;
   NSMutableSet<NSString *> *_accessibilityOrderNativeIDs;
+  NSMutableArray<NSObject *> *_accessibilityElements;
+  RCTViewAccessibilityElement *_axElementDescribingSelf;
 }
 
 #ifdef RCT_DYNAMIC_FRAMEWORKS
@@ -402,11 +405,7 @@ const CGFloat BACKGROUND_COLOR_ZPOSITION = -1024.0f;
       [_accessibilityOrderNativeIDs addObject:RCTNSStringFromString(childId)];
     }
 
-    // If we are prop updating and have children we can go ahead and assign this prop.
-    // Otherwise, we might not have children attached yet and need to wait before then.
-    if (self.currentContainerView.subviews.count > 0) {
-      [self updateAccessibilityElements];
-    }
+    _accessibilityElements = [NSMutableArray new];
   }
 
   // `accessibilityTraits`
@@ -618,6 +617,7 @@ const CGFloat BACKGROUND_COLOR_ZPOSITION = -1024.0f;
   _isJSResponder = NO;
   _removeClippedSubviews = NO;
   _reactSubviews = [NSMutableArray new];
+  _accessibilityElements = [NSMutableArray new];
 }
 
 - (void)setPropKeysManagedByAnimated_DO_NOT_USE_THIS_IS_BROKEN:(NSSet<NSString *> *_Nullable)props
@@ -1149,37 +1149,43 @@ static RCTBorderStyle RCTBorderStyleFromOutlineStyle(OutlineStyle outlineStyle)
   return self;
 }
 
-- (void)didMoveToSuperview
+- (NSArray<NSObject *> *)accessibilityElements
 {
-  // At this point we are guaranteed to have subviews, if we are going to have them
-  if (ReactNativeFeatureFlags::enableAccessibilityOrder()) {
-    [self updateAccessibilityElements];
+  if ([_accessibilityOrderNativeIDs count] <= 0) {
+    return super.accessibilityElements;
   }
-}
 
-- (void)updateAccessibilityElements
-{
-  if ([_accessibilityOrderNativeIDs count] == 0) {
-    self.accessibilityElements = nil;
-    return;
+  // TODO: Currently this ignores changes to descendant nativeID's. While that should rarely, if ever happen, it's an
+  // edge case we should address. Currently this fixes some app deaths so landing this without addressing that edge case
+  // for now.
+  if ([_accessibilityElements count] > 0) {
+    return _accessibilityElements;
   }
 
   NSMutableDictionary<NSString *, UIView *> *nativeIdToView = [NSMutableDictionary new];
+
   [RCTViewComponentView collectAccessibilityElements:self
                                       intoDictionary:nativeIdToView
                                            nativeIds:_accessibilityOrderNativeIDs];
 
-  NSMutableArray *accessibilityElements = [NSMutableArray new];
-  for (const auto &childId : _props->accessibilityOrder) {
+  for (auto childId : _props->accessibilityOrder) {
     NSString *nsStringChildId = RCTNSStringFromString(childId);
-
-    UIView *viewWithMatchingNativeId = [nativeIdToView objectForKey:nsStringChildId];
-    if (viewWithMatchingNativeId != nil) {
-      [accessibilityElements addObject:viewWithMatchingNativeId];
+    // Special case to allow for self-referencing with accessibilityOrder
+    if ([nsStringChildId isEqualToString:self.nativeId]) {
+      if (!_axElementDescribingSelf) {
+        _axElementDescribingSelf = [[RCTViewAccessibilityElement alloc] initWithView:self];
+      }
+      _axElementDescribingSelf.isAccessibilityElement = [super isAccessibilityElement];
+      [_accessibilityElements addObject:_axElementDescribingSelf];
+    } else {
+      UIView *viewWithMatchingNativeId = [nativeIdToView objectForKey:nsStringChildId];
+      if (viewWithMatchingNativeId) {
+        [_accessibilityElements addObject:viewWithMatchingNativeId];
+      }
     }
   }
 
-  self.accessibilityElements = accessibilityElements;
+  return _accessibilityElements;
 }
 
 + (void)collectAccessibilityElements:(UIView *)view
@@ -1246,6 +1252,13 @@ static NSString *RCTRecursiveAccessibilityLabel(UIView *view)
     return self.contentView.isAccessibilityElement;
   }
 
+  // If we reference ourselves in accessibilityOrder then we will make a
+  // UIAccessibilityElement object to represent ourselves since returning YES
+  // here would mean iOS would not call into accessibilityElements
+  if ([_accessibilityOrderNativeIDs containsObject:self.nativeId]) {
+    return NO;
+  }
+
   return [super isAccessibilityElement];
 }
 

packages/react-native/ReactAndroid/api/ReactAndroid.api

@@ -31,8 +31,8 @@ public abstract class com/facebook/react/HeadlessJsTaskService : android/app/Ser
 	public fun <init> ()V
 	public static final fun acquireWakeLockNow (Landroid/content/Context;)V
 	protected final fun getReactContext ()Lcom/facebook/react/bridge/ReactContext;
-	protected fun getReactHost ()Lcom/facebook/react/ReactHost;
-	protected fun getReactNativeHost ()Lcom/facebook/react/ReactNativeHost;
+	protected final fun getReactHost ()Lcom/facebook/react/ReactHost;
+	protected final fun getReactNativeHost ()Lcom/facebook/react/ReactNativeHost;
 	protected fun getTaskConfig (Landroid/content/Intent;)Lcom/facebook/react/jstasks/HeadlessJsTaskConfig;
 	public fun onBind (Landroid/content/Intent;)Landroid/os/IBinder;
 	public fun onDestroy ()V

packages/react-native/ReactAndroid/build.gradle.kts

@@ -19,7 +19,6 @@ plugins {
   alias(libs.plugins.android.library)
   alias(libs.plugins.download)
   alias(libs.plugins.kotlin.android)
-  alias(libs.plugins.ktfmt)
 }
 
 version = project.findProperty("VERSION_NAME")?.toString()!!
@@ -621,7 +620,6 @@ dependencies {
   api(libs.androidx.autofill)
   api(libs.androidx.swiperefreshlayout)
   api(libs.androidx.tracing)
-  api(libs.androidx.window)
 
   api(libs.fbjni)
   api(libs.fresco)

packages/react-native/ReactAndroid/src/main/java/com/facebook/react/HeadlessJsTaskService.kt

@@ -113,7 +113,7 @@ public abstract class HeadlessJsTaskService : Service(), HeadlessJsTaskEventList
    * somewhere.
    */
   @Suppress("DEPRECATION")
-  protected open val reactNativeHost: ReactNativeHost
+  protected val reactNativeHost: ReactNativeHost
     get() = (application as ReactApplication).reactNativeHost
 
   /**
@@ -121,7 +121,7 @@ public abstract class HeadlessJsTaskService : Service(), HeadlessJsTaskEventList
    * [ReactApplication] and calls [ReactApplication.reactHost]. This method assumes it is called in
    * new architecture and returns null if not.
    */
-  protected open val reactHost: ReactHost?
+  protected val reactHost: ReactHost?
     get() = (application as ReactApplication).reactHost
 
   protected val reactContext: ReactContext?

packages/react-native/ReactAndroid/src/main/java/com/facebook/react/ReactRootView.java

@@ -135,10 +135,6 @@ public class ReactRootView extends FrameLayout implements RootView, ReactRoot {
   private void init() {
     setRootViewTag(ReactRootViewTagGenerator.getNextRootViewTag());
     setClipChildren(false);
-
-    if (ReactNativeFeatureFlags.enableFontScaleChangesUpdatingLayout()) {
-      DisplayMetricsHolder.initDisplayMetrics(getContext().getApplicationContext());
-    }
   }
 
   @Override
@@ -869,7 +865,7 @@ public class ReactRootView extends FrameLayout implements RootView, ReactRoot {
     private int mDeviceRotation = 0;
 
     /* package */ CustomGlobalLayoutListener() {
-      DisplayMetricsHolder.initDisplayMetricsIfNotInitialized(getContext());
+      DisplayMetricsHolder.initDisplayMetricsIfNotInitialized(getContext().getApplicationContext());
       mVisibleViewArea = new Rect();
       mMinKeyboardHeightDetected = (int) PixelUtil.toPixelFromDIP(60);
     }
@@ -992,7 +988,7 @@ public class ReactRootView extends FrameLayout implements RootView, ReactRoot {
         return;
       }
       mDeviceRotation = rotation;
-      DisplayMetricsHolder.initDisplayMetrics(getContext());
+      DisplayMetricsHolder.initDisplayMetrics(getContext().getApplicationContext());
       emitOrientationChanged(rotation);
     }
 

packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/ReadableNativeArray.kt

@@ -8,7 +8,6 @@
 package com.facebook.react.bridge
 
 import com.facebook.proguard.annotations.DoNotStrip
-import com.facebook.react.internal.featureflags.ReactNativeFeatureFlags
 import java.util.ArrayList
 import java.util.Arrays
 import kotlin.jvm.JvmStatic
@@ -66,16 +65,9 @@ public open class ReadableNativeArray protected constructor() : NativeArray(), R
     if (other !is ReadableNativeArray) {
       return false
     }
-
-    return if (ReactNativeFeatureFlags.useNativeEqualsInNativeReadableArrayAndroid()) {
-      nativeEquals(other)
-    } else {
-      localArray.contentDeepEquals(other.localArray)
-    }
+    return localArray.contentDeepEquals(other.localArray)
   }
 
-  private external fun nativeEquals(other: ReadableNativeArray): Boolean
-
   override fun toArrayList(): ArrayList<Any?> {
     val arrayList = ArrayList<Any?>()
     repeat(size()) { i ->

packages/react-native/ReactAndroid/src/main/java/com/facebook/react/internal/featureflags/ReactNativeFeatureFlags.kt

@@ -4,7 +4,7 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @generated SignedSource<<a90efac589511beb130c499e51150de8>>
+ * @generated SignedSource<<64faf70fad18019fc27e77681ff41d05>>
  */
 
 /**
@@ -54,12 +54,6 @@ public object ReactNativeFeatureFlags {
   @JvmStatic
   public fun disableMountItemReorderingAndroid(): Boolean = accessor.disableMountItemReorderingAndroid()
 
-  /**
-   * Disable some workarounds for old Android versions in TextLayoutManager logic for retrieving attachment metrics
-   */
-  @JvmStatic
-  public fun disableOldAndroidAttachmentMetricsWorkarounds(): Boolean = accessor.disableOldAndroidAttachmentMetricsWorkarounds()
-
   /**
    * Turns off the global measurement cache used by TextLayoutManager on Android.
    */
@@ -162,12 +156,6 @@ public object ReactNativeFeatureFlags {
   @JvmStatic
   public fun enableIOSViewClipToPaddingBox(): Boolean = accessor.enableIOSViewClipToPaddingBox()
 
-  /**
-   * Dispatches state updates for content offset changes synchronously on the main thread.
-   */
-  @JvmStatic
-  public fun enableImmediateUpdateModeForContentOffsetChanges(): Boolean = accessor.enableImmediateUpdateModeForContentOffsetChanges()
-
   /**
    * This is to fix the issue with interop view manager where component descriptor lookup is causing ViewManager to preload.
    */
@@ -234,6 +222,12 @@ public object ReactNativeFeatureFlags {
   @JvmStatic
   public fun enableResourceTimingAPI(): Boolean = accessor.enableResourceTimingAPI()
 
+  /**
+   * Dispatches state updates synchronously in Fabric (e.g.: updates the scroll position in the shadow tree synchronously from the main thread).
+   */
+  @JvmStatic
+  public fun enableSynchronousStateUpdates(): Boolean = accessor.enableSynchronousStateUpdates()
+
   /**
    * Enables View Culling: as soon as a view goes off screen, it can be reused anywhere in the UI and pieced together with other items to create new UI elements.
    */
@@ -306,24 +300,12 @@ public object ReactNativeFeatureFlags {
   @JvmStatic
   public fun preparedTextCacheSize(): Double = accessor.preparedTextCacheSize()
 
-  /**
-   * Enables a new mechanism in ShadowTree to prevent problems caused by multiple threads trying to commit concurrently. If a thread tries to commit a few times unsuccessfully, it will acquire a lock and try again.
-   */
-  @JvmStatic
-  public fun preventShadowTreeCommitExhaustionWithLocking(): Boolean = accessor.preventShadowTreeCommitExhaustionWithLocking()
-
   /**
    * Releases the cached image data when it is consumed by the observers.
    */
   @JvmStatic
   public fun releaseImageDataWhenConsumed(): Boolean = accessor.releaseImageDataWhenConsumed()
 
-  /**
-   * Skip activity identity assertion in ReactHostImpl::onHostPause()
-   */
-  @JvmStatic
-  public fun skipActivityIdentityAssertionOnHostPause(): Boolean = accessor.skipActivityIdentityAssertionOnHostPause()
-
   /**
    * Enables storing js caller stack when creating promise in native module. This is useful in case of Promise rejection and tracing the cause.
    */
@@ -348,18 +330,6 @@ public object ReactNativeFeatureFlags {
   @JvmStatic
   public fun useFabricInterop(): Boolean = accessor.useFabricInterop()
 
-  /**
-   * Use a native implementation of equals in NativeReadableArray.
-   */
-  @JvmStatic
-  public fun useNativeEqualsInNativeReadableArrayAndroid(): Boolean = accessor.useNativeEqualsInNativeReadableArrayAndroid()
-
-  /**
-   * Use a native implementation of TransformHelper
-   */
-  @JvmStatic
-  public fun useNativeTransformHelperAndroid(): Boolean = accessor.useNativeTransformHelperAndroid()
-
   /**
    * When enabled, the native view configs are used in bridgeless mode.
    */

packages/react-native/ReactAndroid/src/main/java/com/facebook/react/internal/featureflags/ReactNativeFeatureFlagsCxxAccessor.kt

@@ -4,7 +4,7 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @generated SignedSource<<b32f66fb09971e786dd1380bbf417720>>
+ * @generated SignedSource<<d09b78184190ec69fcaa937031cd7f04>>
  */
 
 /**
@@ -24,7 +24,6 @@ internal class ReactNativeFeatureFlagsCxxAccessor : ReactNativeFeatureFlagsAcces
   private var cxxNativeAnimatedEnabledCache: Boolean? = null
   private var cxxNativeAnimatedRemoveJsSyncCache: Boolean? = null
   private var disableMountItemReorderingAndroidCache: Boolean? = null
-  private var disableOldAndroidAttachmentMetricsWorkaroundsCache: Boolean? = null
   private var disableTextLayoutManagerCacheAndroidCache: Boolean? = null
   private var enableAccessibilityOrderCache: Boolean? = null
   private var enableAccumulatedUpdatesInRawPropsAndroidCache: Boolean? = null
@@ -42,7 +41,6 @@ internal class ReactNativeFeatureFlagsCxxAccessor : ReactNativeFeatureFlagsAcces
   private var enableFontScaleChangesUpdatingLayoutCache: Boolean? = null
   private var enableIOSTextBaselineOffsetPerLineCache: Boolean? = null
   private var enableIOSViewClipToPaddingBoxCache: Boolean? = null
-  private var enableImmediateUpdateModeForContentOffsetChangesCache: Boolean? = null
   private var enableInteropViewManagerClassLookUpOptimizationIOSCache: Boolean? = null
   private var enableLayoutAnimationsOnAndroidCache: Boolean? = null
   private var enableLayoutAnimationsOnIOSCache: Boolean? = null
@@ -54,6 +52,7 @@ internal class ReactNativeFeatureFlagsCxxAccessor : ReactNativeFeatureFlagsAcces
   private var enablePreparedTextLayoutCache: Boolean? = null
   private var enablePropsUpdateReconciliationAndroidCache: Boolean? = null
   private var enableResourceTimingAPICache: Boolean? = null
+  private var enableSynchronousStateUpdatesCache: Boolean? = null
   private var enableViewCullingCache: Boolean? = null
   private var enableViewRecyclingCache: Boolean? = null
   private var enableViewRecyclingForTextCache: Boolean? = null
@@ -66,15 +65,11 @@ internal class ReactNativeFeatureFlagsCxxAccessor : ReactNativeFeatureFlagsAcces
   private var fuseboxNetworkInspectionEnabledCache: Boolean? = null
   private var hideOffscreenVirtualViewsOnIOSCache: Boolean? = null
   private var preparedTextCacheSizeCache: Double? = null
-  private var preventShadowTreeCommitExhaustionWithLockingCache: Boolean? = null
   private var releaseImageDataWhenConsumedCache: Boolean? = null
-  private var skipActivityIdentityAssertionOnHostPauseCache: Boolean? = null
   private var traceTurboModulePromiseRejectionsOnAndroidCache: Boolean? = null
   private var updateRuntimeShadowNodeReferencesOnCommitCache: Boolean? = null
   private var useAlwaysAvailableJSErrorHandlingCache: Boolean? = null
   private var useFabricInteropCache: Boolean? = null
-  private var useNativeEqualsInNativeReadableArrayAndroidCache: Boolean? = null
-  private var useNativeTransformHelperAndroidCache: Boolean? = null
   private var useNativeViewConfigsInBridgelessModeCache: Boolean? = null
   private var useOptimizedEventBatchingOnAndroidCache: Boolean? = null
   private var useRawPropsJsiValueCache: Boolean? = null
@@ -119,15 +114,6 @@ internal class ReactNativeFeatureFlagsCxxAccessor : ReactNativeFeatureFlagsAcces
     return cached
   }
 
-  override fun disableOldAndroidAttachmentMetricsWorkarounds(): Boolean {
-    var cached = disableOldAndroidAttachmentMetricsWorkaroundsCache
-    if (cached == null) {
-      cached = ReactNativeFeatureFlagsCxxInterop.disableOldAndroidAttachmentMetricsWorkarounds()
-      disableOldAndroidAttachmentMetricsWorkaroundsCache = cached
-    }
-    return cached
-  }
-
   override fun disableTextLayoutManagerCacheAndroid(): Boolean {
     var cached = disableTextLayoutManagerCacheAndroidCache
     if (cached == null) {
@@ -281,15 +267,6 @@ internal class ReactNativeFeatureFlagsCxxAccessor : ReactNativeFeatureFlagsAcces
     return cached
   }
 
-  override fun enableImmediateUpdateModeForContentOffsetChanges(): Boolean {
-    var cached = enableImmediateUpdateModeForContentOffsetChangesCache
-    if (cached == null) {
-      cached = ReactNativeFeatureFlagsCxxInterop.enableImmediateUpdateModeForContentOffsetChanges()
-      enableImmediateUpdateModeForContentOffsetChangesCache = cached
-    }
-    return cached
-  }
-
   override fun enableInteropViewManagerClassLookUpOptimizationIOS(): Boolean {
     var cached = enableInteropViewManagerClassLookUpOptimizationIOSCache
     if (cached == null) {
@@ -389,6 +366,15 @@ internal class ReactNativeFeatureFlagsCxxAccessor : ReactNativeFeatureFlagsAcces
     return cached
   }
 
+  override fun enableSynchronousStateUpdates(): Boolean {
+    var cached = enableSynchronousStateUpdatesCache
+    if (cached == null) {
+      cached = ReactNativeFeatureFlagsCxxInterop.enableSynchronousStateUpdates()
+      enableSynchronousStateUpdatesCache = cached
+    }
+    return cached
+  }
+
   override fun enableViewCulling(): Boolean {
     var cached = enableViewCullingCache
     if (cached == null) {
@@ -497,15 +483,6 @@ internal class ReactNativeFeatureFlagsCxxAccessor : ReactNativeFeatureFlagsAcces
     return cached
   }
 
-  override fun preventShadowTreeCommitExhaustionWithLocking(): Boolean {
-    var cached = preventShadowTreeCommitExhaustionWithLockingCache
-    if (cached == null) {
-      cached = ReactNativeFeatureFlagsCxxInterop.preventShadowTreeCommitExhaustionWithLocking()
-      preventShadowTreeCommitExhaustionWithLockingCache = cached
-    }
-    return cached
-  }
-
   override fun releaseImageDataWhenConsumed(): Boolean {
     var cached = releaseImageDataWhenConsumedCache
     if (cached == null) {
@@ -515,15 +492,6 @@ internal class ReactNativeFeatureFlagsCxxAccessor : ReactNativeFeatureFlagsAcces
     return cached
   }
 
-  override fun skipActivityIdentityAssertionOnHostPause(): Boolean {
-    var cached = skipActivityIdentityAssertionOnHostPauseCache
-    if (cached == null) {
-      cached = ReactNativeFeatureFlagsCxxInterop.skipActivityIdentityAssertionOnHostPause()
-      skipActivityIdentityAssertionOnHostPauseCache = cached
-    }
-    return cached
-  }
-
   override fun traceTurboModulePromiseRejectionsOnAndroid(): Boolean {
     var cached = traceTurboModulePromiseRejectionsOnAndroidCache
     if (cached == null) {
@@ -560,24 +528,6 @@ internal class ReactNativeFeatureFlagsCxxAccessor : ReactNativeFeatureFlagsAcces
     return cached
   }
 
-  override fun useNativeEqualsInNativeReadableArrayAndroid(): Boolean {
-    var cached = useNativeEqualsInNativeReadableArrayAndroidCache
-    if (cached == null) {
-      cached = ReactNativeFeatureFlagsCxxInterop.useNativeEqualsInNativeReadableArrayAndroid()
-      useNativeEqualsInNativeReadableArrayAndroidCache = cached
-    }
-    return cached
-  }
-
-  override fun useNativeTransformHelperAndroid(): Boolean {
-    var cached = useNativeTransformHelperAndroidCache
-    if (cached == null) {
-      cached = ReactNativeFeatureFlagsCxxInterop.useNativeTransformHelperAndroid()
-      useNativeTransformHelperAndroidCache = cached
-    }
-    return cached
-  }
-
   override fun useNativeViewConfigsInBridgelessMode(): Boolean {
     var cached = useNativeViewConfigsInBridgelessModeCache
     if (cached == null) {

packages/react-native/ReactAndroid/src/main/java/com/facebook/react/internal/featureflags/ReactNativeFeatureFlagsCxxInterop.kt

@@ -4,7 +4,7 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @generated SignedSource<<d1da48f826bc6a1793d1630cb89cb5c1>>
+ * @generated SignedSource<<b9aa0387de9705e781bac7e522461224>>
  */
 
 /**
@@ -36,8 +36,6 @@ public object ReactNativeFeatureFlagsCxxInterop {
 
   @DoNotStrip @JvmStatic public external fun disableMountItemReorderingAndroid(): Boolean
 
-  @DoNotStrip @JvmStatic public external fun disableOldAndroidAttachmentMetricsWorkarounds(): Boolean
-
   @DoNotStrip @JvmStatic public external fun disableTextLayoutManagerCacheAndroid(): Boolean
 
   @DoNotStrip @JvmStatic public external fun enableAccessibilityOrder(): Boolean
@@ -72,8 +70,6 @@ public object ReactNativeFeatureFlagsCxxInterop {
 
   @DoNotStrip @JvmStatic public external fun enableIOSViewClipToPaddingBox(): Boolean
 
-  @DoNotStrip @JvmStatic public external fun enableImmediateUpdateModeForContentOffsetChanges(): Boolean
-
   @DoNotStrip @JvmStatic public external fun enableInteropViewManagerClassLookUpOptimizationIOS(): Boolean
 
   @DoNotStrip @JvmStatic public external fun enableLayoutAnimationsOnAndroid(): Boolean
@@ -96,6 +92,8 @@ public object ReactNativeFeatureFlagsCxxInterop {
 
   @DoNotStrip @JvmStatic public external fun enableResourceTimingAPI(): Boolean
 
+  @DoNotStrip @JvmStatic public external fun enableSynchronousStateUpdates(): Boolean
+
   @DoNotStrip @JvmStatic public external fun enableViewCulling(): Boolean
 
   @DoNotStrip @JvmStatic public external fun enableViewRecycling(): Boolean
@@ -120,12 +118,8 @@ public object ReactNativeFeatureFlagsCxxInterop {
 
   @DoNotStrip @JvmStatic public external fun preparedTextCacheSize(): Double
 
-  @DoNotStrip @JvmStatic public external fun preventShadowTreeCommitExhaustionWithLocking(): Boolean
-
   @DoNotStrip @JvmStatic public external fun releaseImageDataWhenConsumed(): Boolean
 
-  @DoNotStrip @JvmStatic public external fun skipActivityIdentityAssertionOnHostPause(): Boolean
-
   @DoNotStrip @JvmStatic public external fun traceTurboModulePromiseRejectionsOnAndroid(): Boolean
 
   @DoNotStrip @JvmStatic public external fun updateRuntimeShadowNodeReferencesOnCommit(): Boolean
@@ -134,10 +128,6 @@ public object ReactNativeFeatureFlagsCxxInterop {
 
   @DoNotStrip @JvmStatic public external fun useFabricInterop(): Boolean
 
-  @DoNotStrip @JvmStatic public external fun useNativeEqualsInNativeReadableArrayAndroid(): Boolean
-
-  @DoNotStrip @JvmStatic public external fun useNativeTransformHelperAndroid(): Boolean
-
   @DoNotStrip @JvmStatic public external fun useNativeViewConfigsInBridgelessMode(): Boolean
 
   @DoNotStrip @JvmStatic public external fun useOptimizedEventBatchingOnAndroid(): Boolean

packages/react-native/ReactAndroid/src/main/java/com/facebook/react/internal/featureflags/ReactNativeFeatureFlagsDefaults.kt

@@ -4,7 +4,7 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @generated SignedSource<<c5ed8a904dcda7ade87527233b879b92>>
+ * @generated SignedSource<<fdcaa94192d003c28fa3a1d538fc859c>>
  */
 
 /**
@@ -31,8 +31,6 @@ public open class ReactNativeFeatureFlagsDefaults : ReactNativeFeatureFlagsProvi
 
   override fun disableMountItemReorderingAndroid(): Boolean = false
 
-  override fun disableOldAndroidAttachmentMetricsWorkarounds(): Boolean = true
-
   override fun disableTextLayoutManagerCacheAndroid(): Boolean = false
 
   override fun enableAccessibilityOrder(): Boolean = false
@@ -67,8 +65,6 @@ public open class ReactNativeFeatureFlagsDefaults : ReactNativeFeatureFlagsProvi
 
   override fun enableIOSViewClipToPaddingBox(): Boolean = false
 
-  override fun enableImmediateUpdateModeForContentOffsetChanges(): Boolean = false
-
   override fun enableInteropViewManagerClassLookUpOptimizationIOS(): Boolean = false
 
   override fun enableLayoutAnimationsOnAndroid(): Boolean = false
@@ -91,6 +87,8 @@ public open class ReactNativeFeatureFlagsDefaults : ReactNativeFeatureFlagsProvi
 
   override fun enableResourceTimingAPI(): Boolean = false
 
+  override fun enableSynchronousStateUpdates(): Boolean = false
+
   override fun enableViewCulling(): Boolean = false
 
   override fun enableViewRecycling(): Boolean = false
@@ -101,7 +99,7 @@ public open class ReactNativeFeatureFlagsDefaults : ReactNativeFeatureFlagsProvi
 
   override fun enableVirtualViewDebugFeatures(): Boolean = false
 
-  override fun enableVirtualViewRenderState(): Boolean = true
+  override fun enableVirtualViewRenderState(): Boolean = false
 
   override fun enableVirtualViewWindowFocusDetection(): Boolean = false
 
@@ -115,12 +113,8 @@ public open class ReactNativeFeatureFlagsDefaults : ReactNativeFeatureFlagsProvi
 
   override fun preparedTextCacheSize(): Double = 200.0
 
-  override fun preventShadowTreeCommitExhaustionWithLocking(): Boolean = false
-
   override fun releaseImageDataWhenConsumed(): Boolean = false
 
-  override fun skipActivityIdentityAssertionOnHostPause(): Boolean = false
-
   override fun traceTurboModulePromiseRejectionsOnAndroid(): Boolean = false
 
   override fun updateRuntimeShadowNodeReferencesOnCommit(): Boolean = false
@@ -129,10 +123,6 @@ public open class ReactNativeFeatureFlagsDefaults : ReactNativeFeatureFlagsProvi
 
   override fun useFabricInterop(): Boolean = true
 
-  override fun useNativeEqualsInNativeReadableArrayAndroid(): Boolean = false
-
-  override fun useNativeTransformHelperAndroid(): Boolean = false
-
   override fun useNativeViewConfigsInBridgelessMode(): Boolean = false
 
   override fun useOptimizedEventBatchingOnAndroid(): Boolean = false

packages/react-native/ReactAndroid/src/main/java/com/facebook/react/internal/featureflags/ReactNativeFeatureFlagsLocalAccessor.kt

@@ -4,7 +4,7 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @generated SignedSource<<23605f090bfbebe911caa9d3d834d3e8>>
+ * @generated SignedSource<<d645897d5c2e27e7de611605686d8413>>
  */
 
 /**
@@ -28,7 +28,6 @@ internal class ReactNativeFeatureFlagsLocalAccessor : ReactNativeFeatureFlagsAcc
   private var cxxNativeAnimatedEnabledCache: Boolean? = null
   private var cxxNativeAnimatedRemoveJsSyncCache: Boolean? = null
   private var disableMountItemReorderingAndroidCache: Boolean? = null
-  private var disableOldAndroidAttachmentMetricsWorkaroundsCache: Boolean? = null
   private var disableTextLayoutManagerCacheAndroidCache: Boolean? = null
   private var enableAccessibilityOrderCache: Boolean? = null
   private var enableAccumulatedUpdatesInRawPropsAndroidCache: Boolean? = null
@@ -46,7 +45,6 @@ internal class ReactNativeFeatureFlagsLocalAccessor : ReactNativeFeatureFlagsAcc
   private var enableFontScaleChangesUpdatingLayoutCache: Boolean? = null
   private var enableIOSTextBaselineOffsetPerLineCache: Boolean? = null
   private var enableIOSViewClipToPaddingBoxCache: Boolean? = null
-  private var enableImmediateUpdateModeForContentOffsetChangesCache: Boolean? = null
   private var enableInteropViewManagerClassLookUpOptimizationIOSCache: Boolean? = null
   private var enableLayoutAnimationsOnAndroidCache: Boolean? = null
   private var enableLayoutAnimationsOnIOSCache: Boolean? = null
@@ -58,6 +56,7 @@ internal class ReactNativeFeatureFlagsLocalAccessor : ReactNativeFeatureFlagsAcc
   private var enablePreparedTextLayoutCache: Boolean? = null
   private var enablePropsUpdateReconciliationAndroidCache: Boolean? = null
   private var enableResourceTimingAPICache: Boolean? = null
+  private var enableSynchronousStateUpdatesCache: Boolean? = null
   private var enableViewCullingCache: Boolean? = null
   private var enableViewRecyclingCache: Boolean? = null
   private var enableViewRecyclingForTextCache: Boolean? = null
@@ -70,15 +69,11 @@ internal class ReactNativeFeatureFlagsLocalAccessor : ReactNativeFeatureFlagsAcc
   private var fuseboxNetworkInspectionEnabledCache: Boolean? = null
   private var hideOffscreenVirtualViewsOnIOSCache: Boolean? = null
   private var preparedTextCacheSizeCache: Double? = null
-  private var preventShadowTreeCommitExhaustionWithLockingCache: Boolean? = null
   private var releaseImageDataWhenConsumedCache: Boolean? = null
-  private var skipActivityIdentityAssertionOnHostPauseCache: Boolean? = null
   private var traceTurboModulePromiseRejectionsOnAndroidCache: Boolean? = null
   private var updateRuntimeShadowNodeReferencesOnCommitCache: Boolean? = null
   private var useAlwaysAvailableJSErrorHandlingCache: Boolean? = null
   private var useFabricInteropCache: Boolean? = null
-  private var useNativeEqualsInNativeReadableArrayAndroidCache: Boolean? = null
-  private var useNativeTransformHelperAndroidCache: Boolean? = null
   private var useNativeViewConfigsInBridgelessModeCache: Boolean? = null
   private var useOptimizedEventBatchingOnAndroidCache: Boolean? = null
   private var useRawPropsJsiValueCache: Boolean? = null
@@ -127,16 +122,6 @@ internal class ReactNativeFeatureFlagsLocalAccessor : ReactNativeFeatureFlagsAcc
     return cached
   }
 
-  override fun disableOldAndroidAttachmentMetricsWorkarounds(): Boolean {
-    var cached = disableOldAndroidAttachmentMetricsWorkaroundsCache
-    if (cached == null) {
-      cached = currentProvider.disableOldAndroidAttachmentMetricsWorkarounds()
-      accessedFeatureFlags.add("disableOldAndroidAttachmentMetricsWorkarounds")
-      disableOldAndroidAttachmentMetricsWorkaroundsCache = cached
-    }
-    return cached
-  }
-
   override fun disableTextLayoutManagerCacheAndroid(): Boolean {
     var cached = disableTextLayoutManagerCacheAndroidCache
     if (cached == null) {
@@ -307,16 +292,6 @@ internal class ReactNativeFeatureFlagsLocalAccessor : ReactNativeFeatureFlagsAcc
     return cached
   }
 
-  override fun enableImmediateUpdateModeForContentOffsetChanges(): Boolean {
-    var cached = enableImmediateUpdateModeForContentOffsetChangesCache
-    if (cached == null) {
-      cached = currentProvider.enableImmediateUpdateModeForContentOffsetChanges()
-      accessedFeatureFlags.add("enableImmediateUpdateModeForContentOffsetChanges")
-      enableImmediateUpdateModeForContentOffsetChangesCache = cached
-    }
-    return cached
-  }
-
   override fun enableInteropViewManagerClassLookUpOptimizationIOS(): Boolean {
     var cached = enableInteropViewManagerClassLookUpOptimizationIOSCache
     if (cached == null) {
@@ -427,6 +402,16 @@ internal class ReactNativeFeatureFlagsLocalAccessor : ReactNativeFeatureFlagsAcc
     return cached
   }
 
+  override fun enableSynchronousStateUpdates(): Boolean {
+    var cached = enableSynchronousStateUpdatesCache
+    if (cached == null) {
+      cached = currentProvider.enableSynchronousStateUpdates()
+      accessedFeatureFlags.add("enableSynchronousStateUpdates")
+      enableSynchronousStateUpdatesCache = cached
+    }
+    return cached
+  }
+
   override fun enableViewCulling(): Boolean {
     var cached = enableViewCullingCache
     if (cached == null) {
@@ -547,16 +532,6 @@ internal class ReactNativeFeatureFlagsLocalAccessor : ReactNativeFeatureFlagsAcc
     return cached
   }
 
-  override fun preventShadowTreeCommitExhaustionWithLocking(): Boolean {
-    var cached = preventShadowTreeCommitExhaustionWithLockingCache
-    if (cached == null) {
-      cached = currentProvider.preventShadowTreeCommitExhaustionWithLocking()
-      accessedFeatureFlags.add("preventShadowTreeCommitExhaustionWithLocking")
-      preventShadowTreeCommitExhaustionWithLockingCache = cached
-    }
-    return cached
-  }
-
   override fun releaseImageDataWhenConsumed(): Boolean {
     var cached = releaseImageDataWhenConsumedCache
     if (cached == null) {
@@ -567,16 +542,6 @@ internal class ReactNativeFeatureFlagsLocalAccessor : ReactNativeFeatureFlagsAcc
     return cached
   }
 
-  override fun skipActivityIdentityAssertionOnHostPause(): Boolean {
-    var cached = skipActivityIdentityAssertionOnHostPauseCache
-    if (cached == null) {
-      cached = currentProvider.skipActivityIdentityAssertionOnHostPause()
-      accessedFeatureFlags.add("skipActivityIdentityAssertionOnHostPause")
-      skipActivityIdentityAssertionOnHostPauseCache = cached
-    }
-    return cached
-  }
-
   override fun traceTurboModulePromiseRejectionsOnAndroid(): Boolean {
     var cached = traceTurboModulePromiseRejectionsOnAndroidCache
     if (cached == null) {
@@ -617,26 +582,6 @@ internal class ReactNativeFeatureFlagsLocalAccessor : ReactNativeFeatureFlagsAcc
     return cached
   }
 
-  override fun useNativeEqualsInNativeReadableArrayAndroid(): Boolean {
-    var cached = useNativeEqualsInNativeReadableArrayAndroidCache
-    if (cached == null) {
-      cached = currentProvider.useNativeEqualsInNativeReadableArrayAndroid()
-      accessedFeatureFlags.add("useNativeEqualsInNativeReadableArrayAndroid")
-      useNativeEqualsInNativeReadableArrayAndroidCache = cached
-    }
-    return cached
-  }
-
-  override fun useNativeTransformHelperAndroid(): Boolean {
-    var cached = useNativeTransformHelperAndroidCache
-    if (cached == null) {
-      cached = currentProvider.useNativeTransformHelperAndroid()
-      accessedFeatureFlags.add("useNativeTransformHelperAndroid")
-      useNativeTransformHelperAndroidCache = cached
-    }
-    return cached
-  }
-
   override fun useNativeViewConfigsInBridgelessMode(): Boolean {
     var cached = useNativeViewConfigsInBridgelessModeCache
     if (cached == null) {

packages/react-native/ReactAndroid/src/main/java/com/facebook/react/internal/featureflags/ReactNativeFeatureFlagsProvider.kt

@@ -4,7 +4,7 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @generated SignedSource<<780793412b76f101be1569d7a866c435>>
+ * @generated SignedSource<<8168412a7d792853fa19e10a621012c4>>
  */
 
 /**
@@ -31,8 +31,6 @@ public interface ReactNativeFeatureFlagsProvider {
 
   @DoNotStrip public fun disableMountItemReorderingAndroid(): Boolean
 
-  @DoNotStrip public fun disableOldAndroidAttachmentMetricsWorkarounds(): Boolean
-
   @DoNotStrip public fun disableTextLayoutManagerCacheAndroid(): Boolean
 
   @DoNotStrip public fun enableAccessibilityOrder(): Boolean
@@ -67,8 +65,6 @@ public interface ReactNativeFeatureFlagsProvider {
 
   @DoNotStrip public fun enableIOSViewClipToPaddingBox(): Boolean
 
-  @DoNotStrip public fun enableImmediateUpdateModeForContentOffsetChanges(): Boolean
-
   @DoNotStrip public fun enableInteropViewManagerClassLookUpOptimizationIOS(): Boolean
 
   @DoNotStrip public fun enableLayoutAnimationsOnAndroid(): Boolean
@@ -91,6 +87,8 @@ public interface ReactNativeFeatureFlagsProvider {
 
   @DoNotStrip public fun enableResourceTimingAPI(): Boolean
 
+  @DoNotStrip public fun enableSynchronousStateUpdates(): Boolean
+
   @DoNotStrip public fun enableViewCulling(): Boolean
 
   @DoNotStrip public fun enableViewRecycling(): Boolean
@@ -115,12 +113,8 @@ public interface ReactNativeFeatureFlagsProvider {
 
   @DoNotStrip public fun preparedTextCacheSize(): Double
 
-  @DoNotStrip public fun preventShadowTreeCommitExhaustionWithLocking(): Boolean
-
   @DoNotStrip public fun releaseImageDataWhenConsumed(): Boolean
 
-  @DoNotStrip public fun skipActivityIdentityAssertionOnHostPause(): Boolean
-
   @DoNotStrip public fun traceTurboModulePromiseRejectionsOnAndroid(): Boolean
 
   @DoNotStrip public fun updateRuntimeShadowNodeReferencesOnCommit(): Boolean
@@ -129,10 +123,6 @@ public interface ReactNativeFeatureFlagsProvider {
 
   @DoNotStrip public fun useFabricInterop(): Boolean
 
-  @DoNotStrip public fun useNativeEqualsInNativeReadableArrayAndroid(): Boolean
-
-  @DoNotStrip public fun useNativeTransformHelperAndroid(): Boolean
-
   @DoNotStrip public fun useNativeViewConfigsInBridgelessMode(): Boolean
 
   @DoNotStrip public fun useOptimizedEventBatchingOnAndroid(): Boolean

packages/react-native/ReactAndroid/src/main/java/com/facebook/react/internal/featureflags/ReactNativeNewArchitectureFeatureFlags.kt

@@ -23,6 +23,10 @@ import com.facebook.react.common.build.ReactBuildConfig
 @SuppressLint("UseReactNativeNewArchitectureFeatureFlagDetector")
 public object ReactNativeNewArchitectureFeatureFlags {
 
+  @JvmStatic
+  public fun isNewArchitectureStrictModeEnabled(): Boolean =
+      ReactBuildConfig.UNSTABLE_ENABLE_MINIFY_LEGACY_ARCHITECTURE
+
   @JvmStatic
   public fun enableBridgelessArchitecture(): Boolean {
     if (ReactBuildConfig.UNSTABLE_ENABLE_MINIFY_LEGACY_ARCHITECTURE) {

packages/react-native/ReactAndroid/src/main/java/com/facebook/react/modules/blob/BlobModule.kt

@@ -35,6 +35,7 @@ import java.util.HashMap
 import java.util.UUID
 import okhttp3.MediaType
 import okhttp3.RequestBody
+import okhttp3.ResponseBody
 import okio.ByteString
 
 @ReactModule(name = NativeBlobModuleSpec.NAME)
@@ -71,7 +72,7 @@ public class BlobModule(reactContext: ReactApplicationContext) :
           return !isRemote && responseType == "blob"
         }
 
-        override fun fetch(uri: Uri): Pair<WritableMap, ByteArray> {
+        override fun fetch(uri: Uri): WritableMap {
           val data = getBytesFromUri(uri)
 
           val blob = Arguments.createMap()
@@ -84,7 +85,7 @@ public class BlobModule(reactContext: ReactApplicationContext) :
           blob.putString("name", getNameFromUri(uri))
           blob.putDouble("lastModified", getLastModifiedFromUri(uri))
 
-          return blob to data
+          return blob
         }
       }
 
@@ -118,7 +119,8 @@ public class BlobModule(reactContext: ReactApplicationContext) :
           return responseType == "blob"
         }
 
-        override fun toResponseData(data: ByteArray): WritableMap {
+        override fun toResponseData(body: ResponseBody): WritableMap {
+          val data = body.bytes()
           val blob = Arguments.createMap()
           blob.putString("blobId", store(data))
           blob.putInt("offset", 0)

packages/react-native/ReactAndroid/src/main/java/com/facebook/react/modules/network/InspectorNetworkReporter.kt

@@ -58,33 +58,10 @@ internal object InspectorNetworkReporter {
       expectedDataLength: Long
   )
 
-  /**
-   * Report when additional chunks of the response body have been received.
-   *
-   * Corresponds to `Network.dataReceived` in CDP.
-   */
-  @JvmStatic external fun reportDataReceived(requestId: Int, dataLength: Int)
-
   /**
    * Report when a network request is complete and we are no longer receiving response data.
    * - Corresponds to `Network.loadingFinished` in CDP.
    * - Corresponds to `PerformanceResourceTiming.responseEnd`.
    */
   @JvmStatic external fun reportResponseEnd(requestId: Int, encodedDataLength: Long)
-
-  /**
-   * Store response body preview. This is an optional reporting method, and is a no-op if CDP
-   * debugging is disabled.
-   */
-  @JvmStatic
-  external fun maybeStoreResponseBody(requestId: Int, body: String, base64Encoded: Boolean)
-
-  /**
-   * Incrementally store a response body preview, when a string response is received in chunks.
-   * Buffered contents will be flushed to `NetworkReporter` with `reportResponseEnd`.
-   *
-   * As with `maybeStoreResponseBody`, calling this method is optional and a no-op if CDP debugging
-   * is disabled.
-   */
-  @JvmStatic external fun maybeStoreResponseBodyIncremental(requestId: Int, data: String)
 }

packages/react-native/ReactAndroid/src/main/java/com/facebook/react/modules/network/NetworkEventUtil.kt

@@ -10,7 +10,6 @@
 package com.facebook.react.modules.network
 
 import android.os.Bundle
-import android.util.Base64
 import com.facebook.react.bridge.Arguments
 import com.facebook.react.bridge.ReactApplicationContext
 import com.facebook.react.bridge.WritableMap
@@ -66,10 +65,6 @@ internal object NetworkEventUtil {
       progress: Long,
       total: Long
   ) {
-    if (ReactNativeFeatureFlags.enableNetworkEventReporting() && data != null) {
-      InspectorNetworkReporter.reportDataReceived(requestId, data.encodeToByteArray().size)
-      InspectorNetworkReporter.maybeStoreResponseBodyIncremental(requestId, data)
-    }
     reactContext?.emitDeviceEvent(
         "didReceiveNetworkIncrementalData",
         buildReadableArray {
@@ -97,16 +92,7 @@ internal object NetworkEventUtil {
   }
 
   @JvmStatic
-  fun onDataReceived(
-      reactContext: ReactApplicationContext?,
-      requestId: Int,
-      data: String?,
-      responseType: String
-  ) {
-    if (ReactNativeFeatureFlags.enableNetworkEventReporting()) {
-      InspectorNetworkReporter.maybeStoreResponseBody(
-          requestId, data.orEmpty(), responseType == "base64")
-    }
+  fun onDataReceived(reactContext: ReactApplicationContext?, requestId: Int, data: String?) {
     reactContext?.emitDeviceEvent(
         "didReceiveNetworkData",
         buildReadableArray {
@@ -116,16 +102,7 @@ internal object NetworkEventUtil {
   }
 
   @JvmStatic
-  fun onDataReceived(
-      reactContext: ReactApplicationContext?,
-      requestId: Int,
-      data: WritableMap,
-      rawData: ByteArray
-  ) {
-    if (ReactNativeFeatureFlags.enableNetworkEventReporting()) {
-      InspectorNetworkReporter.maybeStoreResponseBody(
-          requestId, Base64.encodeToString(rawData, Base64.NO_WRAP), true)
-    }
+  fun onDataReceived(reactContext: ReactApplicationContext?, requestId: Int, data: WritableMap?) {
     reactContext?.emitDeviceEvent(
         "didReceiveNetworkData",
         Arguments.createArray().apply {

packages/react-native/ReactAndroid/src/main/java/com/facebook/react/modules/network/NetworkingModule.kt

@@ -60,10 +60,8 @@ public class NetworkingModule(
     /** Returns if the handler should be used for an URI. */
     public fun supports(uri: Uri, responseType: String): Boolean
 
-    /**
-     * Fetch the URI and return a tuple containing the JS body payload and the raw response body.
-     */
-    @Throws(IOException::class) public fun fetch(uri: Uri): Pair<WritableMap, ByteArray>
+    /** Fetch the URI and return the JS body payload. */
+    @Throws(IOException::class) public fun fetch(uri: Uri): WritableMap
   }
 
   /** Allows adding custom handling to build the [RequestBody] from the JS body payload. */
@@ -81,7 +79,7 @@ public class NetworkingModule(
     public fun supports(responseType: String): Boolean
 
     /** Returns the JS body payload for the [ResponseBody]. */
-    @Throws(IOException::class) public fun toResponseData(data: ByteArray): WritableMap
+    @Throws(IOException::class) public fun toResponseData(body: ResponseBody): WritableMap
   }
 
   private val client: OkHttpClient
@@ -256,7 +254,7 @@ public class NetworkingModule(
       // Check if a handler is registered
       for (handler in uriHandlers) {
         if (handler.supports(uri, responseType)) {
-          val (res, rawBody) = handler.fetch(uri)
+          val res = handler.fetch(uri)
           val encodedDataLength = res.toString().toByteArray().size
           // fix: UriHandlers which are not using file:// scheme fail in whatwg-fetch at this line
           // https://github.com/JakeChampion/fetch/blob/main/fetch.js#L547
@@ -268,7 +266,7 @@ public class NetworkingModule(
                   .message("OK")
                   .build()
           NetworkEventUtil.onResponseReceived(reactApplicationContext, requestId, url, response)
-          NetworkEventUtil.onDataReceived(reactApplicationContext, requestId, res, rawBody)
+          NetworkEventUtil.onDataReceived(reactApplicationContext, requestId, res)
           NetworkEventUtil.onRequestSuccess(
               reactApplicationContext, requestId, encodedDataLength.toLong())
           return
@@ -545,10 +543,8 @@ public class NetworkingModule(
                   // Check if a handler is registered
                   for (responseHandler in responseHandlers) {
                     if (responseHandler.supports(responseType)) {
-                      val responseData = responseBody.bytes()
-                      val res = responseHandler.toResponseData(responseData)
-                      NetworkEventUtil.onDataReceived(
-                          reactApplicationContext, requestId, res, responseData)
+                      val res = responseHandler.toResponseData(responseBody)
+                      NetworkEventUtil.onDataReceived(reactApplicationContext, requestId, res)
                       NetworkEventUtil.onRequestSuccess(
                           reactApplicationContext, requestId, responseBody.contentLength())
                       return
@@ -586,7 +582,7 @@ public class NetworkingModule(
                     responseString = Base64.encodeToString(responseBody.bytes(), Base64.NO_WRAP)
                   }
                   NetworkEventUtil.onDataReceived(
-                      reactApplicationContext, requestId, responseString, responseType)
+                      reactApplicationContext, requestId, responseString)
                   NetworkEventUtil.onRequestSuccess(
                       reactApplicationContext, requestId, responseBody.contentLength())
                 } catch (e: IOException) {

packages/react-native/ReactAndroid/src/main/java/com/facebook/react/runtime/ReactHostImpl.kt

@@ -253,18 +253,11 @@ public class ReactHostImpl(
 
     val currentActivity = this.currentActivity
     if (currentActivity != null) {
-      val isSameActivity = activity === currentActivity
-      if (!isSameActivity) {
-        val currentActivityClass = currentActivity.javaClass.simpleName
-        val activityClass = if (activity == null) "null" else activity.javaClass.simpleName
-        val isNotSameActivityMessage =
-            "Pausing an activity that is not the current activity, this is incorrect! Current activity: $currentActivityClass Paused activity: $activityClass"
-        if (ReactNativeFeatureFlags.skipActivityIdentityAssertionOnHostPause()) {
-          log(method, isNotSameActivityMessage)
-        } else {
-          Assertions.assertCondition(isSameActivity, isNotSameActivityMessage)
-        }
-      }
+      val currentActivityClass = currentActivity.javaClass.simpleName
+      val activityClass = if (activity == null) "null" else activity.javaClass.simpleName
+      Assertions.assertCondition(
+          activity === currentActivity,
+          "Pausing an activity that is not the current activity, this is incorrect! Current activity: $currentActivityClass Paused activity: $activityClass")
     }
 
     maybeEnableDevSupport(false)

packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/DisplayMetricsHolder.kt

@@ -13,10 +13,8 @@ import android.util.DisplayMetrics
 import android.view.WindowManager
 import androidx.core.view.ViewCompat
 import androidx.core.view.WindowInsetsCompat
-import androidx.window.layout.WindowMetricsCalculator
 import com.facebook.react.bridge.WritableMap
 import com.facebook.react.bridge.WritableNativeMap
-import com.facebook.react.views.view.isEdgeToEdgeFeatureFlagOn
 
 /**
  * Holds an instance of the current DisplayMetrics so we don't have to thread it through all the
@@ -64,19 +62,9 @@ public object DisplayMetricsHolder {
   @JvmStatic
   public fun initDisplayMetrics(context: Context) {
     val displayMetrics = context.resources.displayMetrics
-    val windowDisplayMetrics = DisplayMetrics()
+    windowDisplayMetrics = displayMetrics
     val screenDisplayMetrics = DisplayMetrics()
-
-    windowDisplayMetrics.setTo(displayMetrics)
     screenDisplayMetrics.setTo(displayMetrics)
-
-    if (isEdgeToEdgeFeatureFlagOn) {
-      WindowMetricsCalculator.getOrCreate().computeCurrentWindowMetrics(context).let {
-        windowDisplayMetrics.widthPixels = it.bounds.width()
-        windowDisplayMetrics.heightPixels = it.bounds.height()
-      }
-    }
-
     val wm = context.getSystemService(Context.WINDOW_SERVICE) as WindowManager
     // Get the real display metrics if we are using API level 17 or higher.
     // The real metrics include system decor elements (e.g. soft menu bar).
@@ -84,8 +72,6 @@ public object DisplayMetricsHolder {
     // See:
     // http://developer.android.com/reference/android/view/Display.html#getRealMetrics(android.util.DisplayMetrics)
     @Suppress("DEPRECATION") wm.defaultDisplay.getRealMetrics(screenDisplayMetrics)
-
-    DisplayMetricsHolder.windowDisplayMetrics = windowDisplayMetrics
     DisplayMetricsHolder.screenDisplayMetrics = screenDisplayMetrics
   }
 

packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/OnLayoutEvent.kt

@@ -19,7 +19,7 @@ import com.facebook.react.uimanager.PixelUtil.toDIPFromPixel
 import com.facebook.react.uimanager.events.Event
 
 /** Event used to notify JS component about changes of its position or dimensions. */
-@LegacyArchitecture(logLevel = LegacyArchitectureLogLevel.WARNING)
+@LegacyArchitecture(logLevel = LegacyArchitectureLogLevel.ERROR)
 public class OnLayoutEvent private constructor() : Event<OnLayoutEvent>() {
   @VisibleForTesting internal var x: Int = 0
   @VisibleForTesting internal var y: Int = 0
@@ -60,7 +60,7 @@ public class OnLayoutEvent private constructor() : Event<OnLayoutEvent>() {
   public companion object {
     init {
       LegacyArchitectureLogger.assertLegacyArchitecture(
-          "OnLayoutEvent", LegacyArchitectureLogLevel.WARNING)
+          "OnLayoutEvent", LegacyArchitectureLogLevel.ERROR)
     }
 
     private val EVENTS_POOL: SynchronizedPool<OnLayoutEvent> = SynchronizedPool<OnLayoutEvent>(20)

packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/TransformHelper.kt

@@ -8,12 +8,10 @@
 package com.facebook.react.uimanager
 
 import com.facebook.common.logging.FLog
-import com.facebook.react.bridge.NativeArray
 import com.facebook.react.bridge.ReadableArray
 import com.facebook.react.bridge.ReadableMap
 import com.facebook.react.bridge.ReadableType
 import com.facebook.react.common.ReactConstants
-import com.facebook.react.internal.featureflags.ReactNativeFeatureFlags
 
 public object TransformHelper {
 
@@ -71,14 +69,6 @@ public object TransformHelper {
       transformOrigin: ReadableArray?,
       allowPercentageResolution: Boolean
   ) {
-    if (allowPercentageResolution &&
-        ReactNativeFeatureFlags.useNativeTransformHelperAndroid() &&
-        transforms is NativeArray &&
-        transformOrigin is NativeArray?) {
-      nativeProcessTransform(transforms, result, viewWidth, viewHeight, transformOrigin)
-      return
-    }
-
     val helperMatrix = helperMatrix.get()!!
     MatrixMathHelper.resetIdentityMatrix(result)
     val offsets =
@@ -230,13 +220,4 @@ public object TransformHelper {
 
     return doubleArrayOf(newTranslateX, newTranslateY, newTranslateZ)
   }
-
-  @JvmStatic
-  private external fun nativeProcessTransform(
-      transforms: NativeArray,
-      result: DoubleArray,
-      viewWidth: Float,
-      viewHeight: Float,
-      transformOrigin: NativeArray?
-  )
 }

packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactScrollView.java

@@ -377,9 +377,6 @@ public class ReactScrollView extends ScrollView
     }
 
     ReactScrollViewHelper.emitLayoutEvent(this);
-    if (mVirtualViewContainerState != null) {
-      mVirtualViewContainerState.updateState();
-    }
   }
 
   @Override
@@ -489,9 +486,6 @@ public class ReactScrollView extends ScrollView
             this,
             mOnScrollDispatchHelper.getXFlingVelocity(),
             mOnScrollDispatchHelper.getYFlingVelocity());
-        if (mVirtualViewContainerState != null) {
-          mVirtualViewContainerState.updateState();
-        }
       }
     } finally {
       Systrace.endSection(Systrace.TRACE_TAG_REACT);

packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/scroll/VirtualViewContainer.kt

@@ -11,7 +11,6 @@ import android.graphics.Rect
 import android.view.ViewGroup
 import com.facebook.common.logging.FLog
 import com.facebook.react.common.build.ReactBuildConfig
-import com.facebook.react.internal.featureflags.ReactNativeFeatureFlags
 import com.facebook.react.views.virtual.VirtualViewMode
 import java.util.*
 
@@ -46,19 +45,22 @@ private fun rectsOverlap(rect1: Rect, rect2: Rect): Boolean {
   return true
 }
 
-internal class VirtualViewContainerState(private val scrollView: ViewGroup) {
+internal class VirtualViewContainerState(private val scrollView: ViewGroup) :
+    ReactScrollViewHelper.ScrollListener {
 
-  private val prerenderRatio: Double = ReactNativeFeatureFlags.virtualViewPrerenderRatio()
+  private val prerenderRatio: Int = 1
   private val virtualViews: MutableSet<VirtualView> = mutableSetOf()
   private val emptyRect: Rect = Rect()
   private val visibleRect: Rect = Rect()
   private val prerenderRect: Rect = Rect()
 
-  public fun onChange(virtualView: VirtualView) {
-    if (virtualViews.add(virtualView)) {
-      debugLog("add", { "virtualViewID=${virtualView.virtualViewID}" })
-    } else {
-      debugLog("update", { "virtualViewID=${virtualView.virtualViewID}" })
+  init {
+    ReactScrollViewHelper.addScrollListener(this)
+  }
+
+  public fun add(virtualView: VirtualView) {
+    assert(virtualViews.add(virtualView)) {
+      "Attempting to add duplicate VirtualView: ${virtualView.virtualViewID}"
     }
     updateModes(virtualView)
   }
@@ -67,13 +69,35 @@ internal class VirtualViewContainerState(private val scrollView: ViewGroup) {
     assert(virtualViews.remove(virtualView)) {
       "Attempting to remove non-existent VirtualView: ${virtualView.virtualViewID}"
     }
-    debugLog("remove", { "virtualViewID=${virtualView.virtualViewID}" })
   }
 
-  // Called on ScrollView onLayout or onScroll
-  public fun updateState() {
-    debugLog("VirtualViewContainer.updateState")
-    updateModes()
+  // ReactScrollViewHelper.ScrollListener.onLayout
+  // Emitted from ScrollView's onLayout
+  override fun onLayout(scrollView: ViewGroup?) {
+    // ReactScrollViewHelper is global
+    if (this.scrollView == scrollView) {
+      debugLog("ReactScrollViewHelper.onLayout")
+      updateModes()
+    }
+  }
+
+  // ReactScrollViewHelper.ScrollListener.onScroll
+  // Emitted from ScrollView's onLayout
+  override fun onScroll(
+      scrollView: ViewGroup?,
+      scrollEventType: ScrollEventType?,
+      xVelocity: Float,
+      yVelocity: Float
+  ) {
+    // ReactScrollViewHelper is global
+    if (this.scrollView == scrollView) {
+      debugLog("ReactScrollViewHelper.onScroll")
+      updateModes()
+    }
+  }
+
+  public fun update(virtualView: VirtualView) {
+    updateModes(virtualView)
   }
 
   private fun updateModes(virtualView: VirtualView? = null) {
@@ -86,26 +110,17 @@ internal class VirtualViewContainerState(private val scrollView: ViewGroup) {
     val virtualViewsIt = if (virtualView != null) listOf(virtualView) else virtualViews
     virtualViewsIt.forEach { vv ->
       val rect = vv.containerRelativeRect
-
-      var mode = VirtualViewMode.Hidden
-      var thresholdRect = emptyRect
       when {
-        rect.isEmpty -> {}
         rectsOverlap(rect, visibleRect) -> {
-          mode = VirtualViewMode.Visible
-          thresholdRect = visibleRect
+          vv.onModeChange(VirtualViewMode.Visible, visibleRect)
         }
         rectsOverlap(rect, prerenderRect) -> {
-          mode = VirtualViewMode.Prerender
-          thresholdRect = prerenderRect
+          vv.onModeChange(VirtualViewMode.Prerender, prerenderRect)
+        }
+        else -> {
+          vv.onModeChange(VirtualViewMode.Hidden, emptyRect)
         }
-        else -> {}
       }
-
-      debugLog(
-          "updateModes",
-          { "virtualView=${vv.virtualViewID} mode=$mode  rect=$rect thresholdRect=$thresholdRect" })
-      vv.onModeChange(mode, thresholdRect)
     }
   }
 }

packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/TextLayoutManager.kt

@@ -1102,8 +1102,7 @@ internal object TextLayoutManager {
       // There's a bug on Samsung devices where calling getPrimaryHorizontal on
       // the last offset in the layout will result in an endless loop. Work around
       // this bug by avoiding getPrimaryHorizontal in that case.
-      if (!ReactNativeFeatureFlags.disableOldAndroidAttachmentMetricsWorkarounds() &&
-          start == text.length - 1) {
+      if (start == text.length - 1) {
         val endsWithNewLine = text.length > 0 && text[layout.getLineEnd(line) - 1] == '\n'
         val lineWidth = if (endsWithNewLine) layout.getLineMax(line) else layout.getLineWidth(line)
         placeholderLeftPosition =
@@ -1128,9 +1127,7 @@ internal object TextLayoutManager {
         placeholderLeftPosition =
             if (characterAndParagraphDirectionMatch) layout.getPrimaryHorizontal(start)
             else layout.getSecondaryHorizontal(start)
-        if (!ReactNativeFeatureFlags.disableOldAndroidAttachmentMetricsWorkarounds() &&
-            isRtlParagraph &&
-            !isRtlChar) {
+        if (isRtlParagraph && !isRtlChar) {
           // Adjust `placeholderLeftPosition` to work around an Android bug.
           // The bug is when the paragraph is RTL and `setSingleLine(true)`, some layout
           // methods such as `getPrimaryHorizontal`, `getSecondaryHorizontal`, and

packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/virtual/view/ReactVirtualView.kt

@@ -101,7 +101,7 @@ public class ReactVirtualView(context: Context) :
     ReactScrollViewHelper.removeScrollListener(this)
     ReactScrollViewHelper.removeLayoutChangeListener(this)
     if (detectWindowFocus) {
-      viewTreeObserver.removeOnWindowFocusChangeListener(onWindowFocusChangeListener)
+      viewTreeObserver.addOnWindowFocusChangeListener(onWindowFocusChangeListener)
     }
     cleanupLayoutListeners()
   }

packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/virtual/viewexperimental/ReactVirtualViewExperimental.kt

@@ -34,7 +34,6 @@ public class ReactVirtualViewExperimental(context: Context) :
   override val containerRelativeRect: Rect = Rect()
   private var offsetX: Int = 0
   private var offsetY: Int = 0
-  private var hadLayout: Boolean = false
 
   internal val nativeId: String?
     get() = getTag(R.id.view_tag_native_id) as? String
@@ -46,20 +45,14 @@ public class ReactVirtualViewExperimental(context: Context) :
 
   @VisibleForTesting
   internal fun doAttachedToWindow() {
-    scrollView = getScrollView()
-    // onAttachedToWindow is usually called before layout but there are cases where it's called
-    // after. If called after, we need to report the updated layout to the VirtualViewContainer
-    if (hadLayout) {
-      updateParentOffset()
-      reportChangeToContainer()
-    }
+    // Assuming that layout has been called before this
+    scrollView = getScrollView()?.also { scrollView?.virtualViewContainerState?.add(this) }
   }
 
   /** From [View#onLayout] */
   // This is when the view itself has layout changes
   override fun onLayout(changed: Boolean, left: Int, top: Int, right: Int, bottom: Int) {
     super.onLayout(changed, left, top, right, bottom)
-    hadLayout = true
     if (changed) {
       containerRelativeRect.set(
           left + offsetX,
@@ -67,7 +60,7 @@ public class ReactVirtualViewExperimental(context: Context) :
           right + offsetX,
           bottom + offsetY,
       )
-      reportChangeToContainer()
+      updateContainer()
     }
   }
 
@@ -84,8 +77,24 @@ public class ReactVirtualViewExperimental(context: Context) :
       oldBottom: Int
   ) {
     if (oldLeft != left || oldTop != top) {
-      updateParentOffset()
-      reportChangeToContainer()
+      val virtualViewScrollView = scrollView ?: return
+      offsetX = 0
+      offsetY = 0
+      var parent: ViewParent? = parent
+      while (parent != null && parent != virtualViewScrollView) {
+        if (parent is View) {
+          offsetX += parent.left
+          offsetY += parent.top
+        }
+        parent = parent.parent
+      }
+      containerRelativeRect.set(
+          left + offsetX,
+          top + offsetY,
+          right + offsetX,
+          bottom + offsetY,
+      )
+      updateContainer()
     }
   }
 
@@ -100,8 +109,6 @@ public class ReactVirtualViewExperimental(context: Context) :
     scrollView = null
     mode = null
     modeChangeEmitter = null
-    hadLayout = false
-    containerRelativeRect.setEmpty()
   }
 
   override val virtualViewID: String
@@ -149,28 +156,8 @@ public class ReactVirtualViewExperimental(context: Context) :
     }
   }
 
-  private fun updateParentOffset() {
-    val virtualViewScrollView = scrollView ?: return
-    offsetX = 0
-    offsetY = 0
-    var parent: ViewParent? = parent
-    while (parent != null && parent != virtualViewScrollView) {
-      if (parent is View) {
-        offsetX += parent.left
-        offsetY += parent.top
-      }
-      parent = parent.parent
-    }
-    containerRelativeRect.set(
-        left + offsetX,
-        top + offsetY,
-        right + offsetX,
-        bottom + offsetY,
-    )
-  }
-
-  private fun reportChangeToContainer() {
-    scrollView?.virtualViewContainerState?.onChange(this)
+  private fun updateContainer() {
+    scrollView?.virtualViewContainerState?.update(this)
   }
 
   private fun getScrollView(): VirtualViewContainer? = traverseParentStack(true)

packages/react-native/ReactAndroid/src/main/jni/react/featureflags/JReactNativeFeatureFlagsCxxInterop.cpp

@@ -4,7 +4,7 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @generated SignedSource<<f310a5dc27fd655eab4445cb25d4c85c>>
+ * @generated SignedSource<<2a33de4ea9c5d0c332845046053a9598>>
  */
 
 /**
@@ -63,12 +63,6 @@ class ReactNativeFeatureFlagsJavaProvider
     return method(javaProvider_);
   }
 
-  bool disableOldAndroidAttachmentMetricsWorkarounds() override {
-    static const auto method =
-        getReactNativeFeatureFlagsProviderJavaClass()->getMethod<jboolean()>("disableOldAndroidAttachmentMetricsWorkarounds");
-    return method(javaProvider_);
-  }
-
   bool disableTextLayoutManagerCacheAndroid() override {
     static const auto method =
         getReactNativeFeatureFlagsProviderJavaClass()->getMethod<jboolean()>("disableTextLayoutManagerCacheAndroid");
@@ -171,12 +165,6 @@ class ReactNativeFeatureFlagsJavaProvider
     return method(javaProvider_);
   }
 
-  bool enableImmediateUpdateModeForContentOffsetChanges() override {
-    static const auto method =
-        getReactNativeFeatureFlagsProviderJavaClass()->getMethod<jboolean()>("enableImmediateUpdateModeForContentOffsetChanges");
-    return method(javaProvider_);
-  }
-
   bool enableInteropViewManagerClassLookUpOptimizationIOS() override {
     static const auto method =
         getReactNativeFeatureFlagsProviderJavaClass()->getMethod<jboolean()>("enableInteropViewManagerClassLookUpOptimizationIOS");
@@ -243,6 +231,12 @@ class ReactNativeFeatureFlagsJavaProvider
     return method(javaProvider_);
   }
 
+  bool enableSynchronousStateUpdates() override {
+    static const auto method =
+        getReactNativeFeatureFlagsProviderJavaClass()->getMethod<jboolean()>("enableSynchronousStateUpdates");
+    return method(javaProvider_);
+  }
+
   bool enableViewCulling() override {
     static const auto method =
         getReactNativeFeatureFlagsProviderJavaClass()->getMethod<jboolean()>("enableViewCulling");
@@ -315,24 +309,12 @@ class ReactNativeFeatureFlagsJavaProvider
     return method(javaProvider_);
   }
 
-  bool preventShadowTreeCommitExhaustionWithLocking() override {
-    static const auto method =
-        getReactNativeFeatureFlagsProviderJavaClass()->getMethod<jboolean()>("preventShadowTreeCommitExhaustionWithLocking");
-    return method(javaProvider_);
-  }
-
   bool releaseImageDataWhenConsumed() override {
     static const auto method =
         getReactNativeFeatureFlagsProviderJavaClass()->getMethod<jboolean()>("releaseImageDataWhenConsumed");
     return method(javaProvider_);
   }
 
-  bool skipActivityIdentityAssertionOnHostPause() override {
-    static const auto method =
-        getReactNativeFeatureFlagsProviderJavaClass()->getMethod<jboolean()>("skipActivityIdentityAssertionOnHostPause");
-    return method(javaProvider_);
-  }
-
   bool traceTurboModulePromiseRejectionsOnAndroid() override {
     static const auto method =
         getReactNativeFeatureFlagsProviderJavaClass()->getMethod<jboolean()>("traceTurboModulePromiseRejectionsOnAndroid");
@@ -357,18 +339,6 @@ class ReactNativeFeatureFlagsJavaProvider
     return method(javaProvider_);
   }
 
-  bool useNativeEqualsInNativeReadableArrayAndroid() override {
-    static const auto method =
-        getReactNativeFeatureFlagsProviderJavaClass()->getMethod<jboolean()>("useNativeEqualsInNativeReadableArrayAndroid");
-    return method(javaProvider_);
-  }
-
-  bool useNativeTransformHelperAndroid() override {
-    static const auto method =
-        getReactNativeFeatureFlagsProviderJavaClass()->getMethod<jboolean()>("useNativeTransformHelperAndroid");
-    return method(javaProvider_);
-  }
-
   bool useNativeViewConfigsInBridgelessMode() override {
     static const auto method =
         getReactNativeFeatureFlagsProviderJavaClass()->getMethod<jboolean()>("useNativeViewConfigsInBridgelessMode");
@@ -435,11 +405,6 @@ bool JReactNativeFeatureFlagsCxxInterop::disableMountItemReorderingAndroid(
   return ReactNativeFeatureFlags::disableMountItemReorderingAndroid();
 }
 
-bool JReactNativeFeatureFlagsCxxInterop::disableOldAndroidAttachmentMetricsWorkarounds(
-    facebook::jni::alias_ref<JReactNativeFeatureFlagsCxxInterop> /*unused*/) {
-  return ReactNativeFeatureFlags::disableOldAndroidAttachmentMetricsWorkarounds();
-}
-
 bool JReactNativeFeatureFlagsCxxInterop::disableTextLayoutManagerCacheAndroid(
     facebook::jni::alias_ref<JReactNativeFeatureFlagsCxxInterop> /*unused*/) {
   return ReactNativeFeatureFlags::disableTextLayoutManagerCacheAndroid();
@@ -525,11 +490,6 @@ bool JReactNativeFeatureFlagsCxxInterop::enableIOSViewClipToPaddingBox(
   return ReactNativeFeatureFlags::enableIOSViewClipToPaddingBox();
 }
 
-bool JReactNativeFeatureFlagsCxxInterop::enableImmediateUpdateModeForContentOffsetChanges(
-    facebook::jni::alias_ref<JReactNativeFeatureFlagsCxxInterop> /*unused*/) {
-  return ReactNativeFeatureFlags::enableImmediateUpdateModeForContentOffsetChanges();
-}
-
 bool JReactNativeFeatureFlagsCxxInterop::enableInteropViewManagerClassLookUpOptimizationIOS(
     facebook::jni::alias_ref<JReactNativeFeatureFlagsCxxInterop> /*unused*/) {
   return ReactNativeFeatureFlags::enableInteropViewManagerClassLookUpOptimizationIOS();
@@ -585,6 +545,11 @@ bool JReactNativeFeatureFlagsCxxInterop::enableResourceTimingAPI(
   return ReactNativeFeatureFlags::enableResourceTimingAPI();
 }
 
+bool JReactNativeFeatureFlagsCxxInterop::enableSynchronousStateUpdates(
+    facebook::jni::alias_ref<JReactNativeFeatureFlagsCxxInterop> /*unused*/) {
+  return ReactNativeFeatureFlags::enableSynchronousStateUpdates();
+}
+
 bool JReactNativeFeatureFlagsCxxInterop::enableViewCulling(
     facebook::jni::alias_ref<JReactNativeFeatureFlagsCxxInterop> /*unused*/) {
   return ReactNativeFeatureFlags::enableViewCulling();
@@ -645,21 +610,11 @@ double JReactNativeFeatureFlagsCxxInterop::preparedTextCacheSize(
   return ReactNativeFeatureFlags::preparedTextCacheSize();
 }
 
-bool JReactNativeFeatureFlagsCxxInterop::preventShadowTreeCommitExhaustionWithLocking(
-    facebook::jni::alias_ref<JReactNativeFeatureFlagsCxxInterop> /*unused*/) {
-  return ReactNativeFeatureFlags::preventShadowTreeCommitExhaustionWithLocking();
-}
-
 bool JReactNativeFeatureFlagsCxxInterop::releaseImageDataWhenConsumed(
     facebook::jni::alias_ref<JReactNativeFeatureFlagsCxxInterop> /*unused*/) {
   return ReactNativeFeatureFlags::releaseImageDataWhenConsumed();
 }
 
-bool JReactNativeFeatureFlagsCxxInterop::skipActivityIdentityAssertionOnHostPause(
-    facebook::jni::alias_ref<JReactNativeFeatureFlagsCxxInterop> /*unused*/) {
-  return ReactNativeFeatureFlags::skipActivityIdentityAssertionOnHostPause();
-}
-
 bool JReactNativeFeatureFlagsCxxInterop::traceTurboModulePromiseRejectionsOnAndroid(
     facebook::jni::alias_ref<JReactNativeFeatureFlagsCxxInterop> /*unused*/) {
   return ReactNativeFeatureFlags::traceTurboModulePromiseRejectionsOnAndroid();
@@ -680,16 +635,6 @@ bool JReactNativeFeatureFlagsCxxInterop::useFabricInterop(
   return ReactNativeFeatureFlags::useFabricInterop();
 }
 
-bool JReactNativeFeatureFlagsCxxInterop::useNativeEqualsInNativeReadableArrayAndroid(
-    facebook::jni::alias_ref<JReactNativeFeatureFlagsCxxInterop> /*unused*/) {
-  return ReactNativeFeatureFlags::useNativeEqualsInNativeReadableArrayAndroid();
-}
-
-bool JReactNativeFeatureFlagsCxxInterop::useNativeTransformHelperAndroid(
-    facebook::jni::alias_ref<JReactNativeFeatureFlagsCxxInterop> /*unused*/) {
-  return ReactNativeFeatureFlags::useNativeTransformHelperAndroid();
-}
-
 bool JReactNativeFeatureFlagsCxxInterop::useNativeViewConfigsInBridgelessMode(
     facebook::jni::alias_ref<JReactNativeFeatureFlagsCxxInterop> /*unused*/) {
   return ReactNativeFeatureFlags::useNativeViewConfigsInBridgelessMode();
@@ -768,9 +713,6 @@ void JReactNativeFeatureFlagsCxxInterop::registerNatives() {
       makeNativeMethod(
         "disableMountItemReorderingAndroid",
         JReactNativeFeatureFlagsCxxInterop::disableMountItemReorderingAndroid),
-      makeNativeMethod(
-        "disableOldAndroidAttachmentMetricsWorkarounds",
-        JReactNativeFeatureFlagsCxxInterop::disableOldAndroidAttachmentMetricsWorkarounds),
       makeNativeMethod(
         "disableTextLayoutManagerCacheAndroid",
         JReactNativeFeatureFlagsCxxInterop::disableTextLayoutManagerCacheAndroid),
@@ -822,9 +764,6 @@ void JReactNativeFeatureFlagsCxxInterop::registerNatives() {
       makeNativeMethod(
         "enableIOSViewClipToPaddingBox",
         JReactNativeFeatureFlagsCxxInterop::enableIOSViewClipToPaddingBox),
-      makeNativeMethod(
-        "enableImmediateUpdateModeForContentOffsetChanges",
-        JReactNativeFeatureFlagsCxxInterop::enableImmediateUpdateModeForContentOffsetChanges),
       makeNativeMethod(
         "enableInteropViewManagerClassLookUpOptimizationIOS",
         JReactNativeFeatureFlagsCxxInterop::enableInteropViewManagerClassLookUpOptimizationIOS),
@@ -858,6 +797,9 @@ void JReactNativeFeatureFlagsCxxInterop::registerNatives() {
       makeNativeMethod(
         "enableResourceTimingAPI",
         JReactNativeFeatureFlagsCxxInterop::enableResourceTimingAPI),
+      makeNativeMethod(
+        "enableSynchronousStateUpdates",
+        JReactNativeFeatureFlagsCxxInterop::enableSynchronousStateUpdates),
       makeNativeMethod(
         "enableViewCulling",
         JReactNativeFeatureFlagsCxxInterop::enableViewCulling),
@@ -894,15 +836,9 @@ void JReactNativeFeatureFlagsCxxInterop::registerNatives() {
       makeNativeMethod(
         "preparedTextCacheSize",
         JReactNativeFeatureFlagsCxxInterop::preparedTextCacheSize),
-      makeNativeMethod(
-        "preventShadowTreeCommitExhaustionWithLocking",
-        JReactNativeFeatureFlagsCxxInterop::preventShadowTreeCommitExhaustionWithLocking),
       makeNativeMethod(
         "releaseImageDataWhenConsumed",
         JReactNativeFeatureFlagsCxxInterop::releaseImageDataWhenConsumed),
-      makeNativeMethod(
-        "skipActivityIdentityAssertionOnHostPause",
-        JReactNativeFeatureFlagsCxxInterop::skipActivityIdentityAssertionOnHostPause),
       makeNativeMethod(
         "traceTurboModulePromiseRejectionsOnAndroid",
         JReactNativeFeatureFlagsCxxInterop::traceTurboModulePromiseRejectionsOnAndroid),
@@ -915,12 +851,6 @@ void JReactNativeFeatureFlagsCxxInterop::registerNatives() {
       makeNativeMethod(
         "useFabricInterop",
         JReactNativeFeatureFlagsCxxInterop::useFabricInterop),
-      makeNativeMethod(
-        "useNativeEqualsInNativeReadableArrayAndroid",
-        JReactNativeFeatureFlagsCxxInterop::useNativeEqualsInNativeReadableArrayAndroid),
-      makeNativeMethod(
-        "useNativeTransformHelperAndroid",
-        JReactNativeFeatureFlagsCxxInterop::useNativeTransformHelperAndroid),
       makeNativeMethod(
         "useNativeViewConfigsInBridgelessMode",
         JReactNativeFeatureFlagsCxxInterop::useNativeViewConfigsInBridgelessMode),

packages/react-native/ReactAndroid/src/main/jni/react/featureflags/JReactNativeFeatureFlagsCxxInterop.h

@@ -4,7 +4,7 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @generated SignedSource<<8c1da07c0b7d2053f7fdaac4326c3ac1>>
+ * @generated SignedSource<<509e0e4d8b2568e2b682797cfb83c79a>>
  */
 
 /**
@@ -42,9 +42,6 @@ class JReactNativeFeatureFlagsCxxInterop
   static bool disableMountItemReorderingAndroid(
     facebook::jni::alias_ref<JReactNativeFeatureFlagsCxxInterop>);
 
-  static bool disableOldAndroidAttachmentMetricsWorkarounds(
-    facebook::jni::alias_ref<JReactNativeFeatureFlagsCxxInterop>);
-
   static bool disableTextLayoutManagerCacheAndroid(
     facebook::jni::alias_ref<JReactNativeFeatureFlagsCxxInterop>);
 
@@ -96,9 +93,6 @@ class JReactNativeFeatureFlagsCxxInterop
   static bool enableIOSViewClipToPaddingBox(
     facebook::jni::alias_ref<JReactNativeFeatureFlagsCxxInterop>);
 
-  static bool enableImmediateUpdateModeForContentOffsetChanges(
-    facebook::jni::alias_ref<JReactNativeFeatureFlagsCxxInterop>);
-
   static bool enableInteropViewManagerClassLookUpOptimizationIOS(
     facebook::jni::alias_ref<JReactNativeFeatureFlagsCxxInterop>);
 
@@ -132,6 +126,9 @@ class JReactNativeFeatureFlagsCxxInterop
   static bool enableResourceTimingAPI(
     facebook::jni::alias_ref<JReactNativeFeatureFlagsCxxInterop>);
 
+  static bool enableSynchronousStateUpdates(
+    facebook::jni::alias_ref<JReactNativeFeatureFlagsCxxInterop>);
+
   static bool enableViewCulling(
     facebook::jni::alias_ref<JReactNativeFeatureFlagsCxxInterop>);
 
@@ -168,15 +165,9 @@ class JReactNativeFeatureFlagsCxxInterop
   static double preparedTextCacheSize(
     facebook::jni::alias_ref<JReactNativeFeatureFlagsCxxInterop>);
 
-  static bool preventShadowTreeCommitExhaustionWithLocking(
-    facebook::jni::alias_ref<JReactNativeFeatureFlagsCxxInterop>);
-
   static bool releaseImageDataWhenConsumed(
     facebook::jni::alias_ref<JReactNativeFeatureFlagsCxxInterop>);
 
-  static bool skipActivityIdentityAssertionOnHostPause(
-    facebook::jni::alias_ref<JReactNativeFeatureFlagsCxxInterop>);
-
   static bool traceTurboModulePromiseRejectionsOnAndroid(
     facebook::jni::alias_ref<JReactNativeFeatureFlagsCxxInterop>);
 
@@ -189,12 +180,6 @@ class JReactNativeFeatureFlagsCxxInterop
   static bool useFabricInterop(
     facebook::jni::alias_ref<JReactNativeFeatureFlagsCxxInterop>);
 
-  static bool useNativeEqualsInNativeReadableArrayAndroid(
-    facebook::jni::alias_ref<JReactNativeFeatureFlagsCxxInterop>);
-
-  static bool useNativeTransformHelperAndroid(
-    facebook::jni::alias_ref<JReactNativeFeatureFlagsCxxInterop>);
-
   static bool useNativeViewConfigsInBridgelessMode(
     facebook::jni::alias_ref<JReactNativeFeatureFlagsCxxInterop>);
 

packages/react-native/ReactAndroid/src/main/jni/react/jni/CMakeLists.txt

@@ -31,14 +31,13 @@ add_library(
           OnLoad-common.cpp
           ReadableNativeArray.cpp
           ReadableNativeMap.cpp
-          TransformHelper.cpp
           WritableNativeArray.cpp
           WritableNativeMap.cpp
 )
 target_merge_so(reactnativejni_common)
 target_include_directories(reactnativejni_common PUBLIC ../../)
 
-target_link_libraries(reactnativejni_common fbjni folly_runtime react_cxxreact rrc_view)
+target_link_libraries(reactnativejni_common fbjni folly_runtime react_cxxreact)
 target_compile_reactnative_options(reactnativejni_common PRIVATE)
 target_compile_options(reactnativejni_common PRIVATE -Wno-unused-lambda-capture)
 

packages/react-native/ReactAndroid/src/main/jni/react/jni/InspectorNetworkReporter.cpp

@@ -11,9 +11,6 @@
 
 #include <cstddef>
 #include <string>
-#ifdef REACT_NATIVE_DEBUGGER_ENABLED
-#include <unordered_map>
-#endif
 
 using namespace facebook::jni;
 using namespace facebook::react::jsinspector_modern;
@@ -52,13 +49,6 @@ std::string limitRequestBodySize(std::string requestBody) {
 
 } // namespace
 
-#ifdef REACT_NATIVE_DEBUGGER_ENABLED
-
-// Dictionary to buffer incremental response bodies (CDP debugging active only)
-static std::unordered_map<int, std::string> responseBuffers;
-
-#endif
-
 /* static */ void InspectorNetworkReporter::reportRequestStart(
     const jni::alias_ref<jclass> /*unused*/,
     jint requestId,
@@ -103,63 +93,12 @@ static std::unordered_map<int, std::string> responseBuffers;
       static_cast<std::int64_t>(encodedDataLength));
 }
 
-/* static */ void InspectorNetworkReporter::reportDataReceived(
-    jni::alias_ref<jclass> /*unused*/,
-    jint requestId,
-    jint dataLength) {
-  NetworkReporter::getInstance().reportDataReceived(
-      std::to_string(requestId), dataLength, std::nullopt);
-}
-
 /* static */ void InspectorNetworkReporter::reportResponseEnd(
     jni::alias_ref<jclass> /*unused*/,
     jint requestId,
     jlong encodedDataLength) {
   NetworkReporter::getInstance().reportResponseEnd(
       std::to_string(requestId), static_cast<std::int64_t>(encodedDataLength));
-
-#ifdef REACT_NATIVE_DEBUGGER_ENABLED
-  // Debug build: Check for buffered response body and flush to NetworkReporter
-  auto buffer = responseBuffers[requestId];
-  if (!buffer.empty()) {
-    NetworkReporter::getInstance().storeResponseBody(
-        std::to_string(requestId), buffer, false);
-    responseBuffers.erase(requestId);
-  }
-#endif
-}
-
-/* static */ void InspectorNetworkReporter::maybeStoreResponseBody(
-    jni::alias_ref<jclass> /*unused*/,
-    jint requestId,
-    jni::alias_ref<jstring> body,
-    jboolean base64Encoded) {
-#ifdef REACT_NATIVE_DEBUGGER_ENABLED
-  // Debug build: Process response body and report to NetworkReporter
-  auto& networkReporter = NetworkReporter::getInstance();
-  if (!networkReporter.isDebuggingEnabled()) {
-    return;
-  }
-
-  networkReporter.storeResponseBody(
-      std::to_string(requestId), body->toStdString(), base64Encoded != 0u);
-#endif
-}
-
-/* static */ void InspectorNetworkReporter::maybeStoreResponseBodyIncremental(
-    jni::alias_ref<jclass> /*unused*/,
-    jint requestId,
-    jni::alias_ref<jstring> data) {
-#ifdef REACT_NATIVE_DEBUGGER_ENABLED
-  // Debug build: Buffer incremental response body contents
-  auto& networkReporter = NetworkReporter::getInstance();
-  if (!networkReporter.isDebuggingEnabled()) {
-    return;
-  }
-
-  auto& buffer = responseBuffers[requestId];
-  buffer += data->toStdString();
-#endif
 }
 
 /* static */ void InspectorNetworkReporter::registerNatives() {
@@ -168,19 +107,11 @@ static std::unordered_map<int, std::string> responseBuffers;
           "reportRequestStart", InspectorNetworkReporter::reportRequestStart),
       makeNativeMethod(
           "reportResponseStart", InspectorNetworkReporter::reportResponseStart),
-      makeNativeMethod(
-          "reportConnectionTiming",
-          InspectorNetworkReporter::reportConnectionTiming),
-      makeNativeMethod(
-          "reportDataReceived", InspectorNetworkReporter::reportDataReceived),
       makeNativeMethod(
           "reportResponseEnd", InspectorNetworkReporter::reportResponseEnd),
       makeNativeMethod(
-          "maybeStoreResponseBody",
-          InspectorNetworkReporter::maybeStoreResponseBody),
-      makeNativeMethod(
-          "maybeStoreResponseBodyIncremental",
-          InspectorNetworkReporter::maybeStoreResponseBodyIncremental),
+          "reportConnectionTiming",
+          InspectorNetworkReporter::reportConnectionTiming),
   });
 }
 

packages/react-native/ReactAndroid/src/main/jni/react/jni/InspectorNetworkReporter.h

@@ -39,27 +39,11 @@ class InspectorNetworkReporter
       jni::alias_ref<jni::JMap<jstring, jstring>> responseHeaders,
       jlong encodedDataLength);
 
-  static void reportDataReceived(
-      jni::alias_ref<jclass> /*unused*/,
-      jint requestId,
-      jint dataLength);
-
   static void reportResponseEnd(
       jni::alias_ref<jclass> /*unused*/,
       jint requestId,
       jlong encodedDataLength);
 
-  static void maybeStoreResponseBody(
-      jni::alias_ref<jclass> /*unused*/,
-      jint requestId,
-      jni::alias_ref<jstring> body,
-      jboolean base64Encoded);
-
-  static void maybeStoreResponseBodyIncremental(
-      jni::alias_ref<jclass> /*unused*/,
-      jint requestId,
-      jni::alias_ref<jstring> data);
-
   static void registerNatives();
 
  private: