Added missing define to target .reactRuntime

The target needs the HERMES_ENABLE_DEBUGGER flag in debug just like .reactHermes does.

This commit fixes this by adding the define.

.flowconfig

@@ -47,10 +47,7 @@ packages/react-native/flow/
 
 [options]
 enums=true
-experimental.pattern_matching=true
-experimental.pattern_matching.includes=<PROJECT_ROOT>/packages/react-native/src/private/components/virtualview/
 casting_syntax=both
-component_syntax=true
 
 emoji=true
 
@@ -105,4 +102,4 @@ untyped-import
 untyped-type-import
 
 [version]
-^0.274.0
+^0.273.1

.github/actions/lint/action.yml

@@ -26,6 +26,9 @@ runs:
     - name: Lint code
       shell: bash
       run: ./.github/workflow-scripts/exec_swallow_error.sh yarn lint --format junit -o ./reports/junit/eslint/results.xml
+    - name: Lint java
+      shell: bash
+      run: ./.github/workflow-scripts/exec_swallow_error.sh yarn lint-java --check
     - name: Lint file structure
       shell: bash
       run: ./.github/workflow-scripts/lint_files.sh

.github/workflow-scripts/analyze_code.sh

@@ -13,6 +13,9 @@ export GITHUB_REPO=-react-native
 
   echo flow
   npm run flow-check --silent --json
+
+  echo google-java-format
+  node scripts/lint-java.js --diff
 } | node private/react-native-bots/code-analysis-bot.js
 
 STATUS=$?

.github/workflows/publish-release.yml

@@ -140,6 +140,27 @@ jobs:
           hermes-version: ${{ needs.prepare_hermes_workspace.outputs.hermes-version }}
           react-native-version: ${{ needs.prepare_hermes_workspace.outputs.react-native-version }}
 
+  build_android:
+    runs-on: 8-core-ubuntu
+    needs: [set_release_type]
+    container:
+      image: reactnativecommunity/react-native-android:latest
+      env:
+        TERM: "dumb"
+        GRADLE_OPTS: "-Dorg.gradle.daemon=false"
+        ORG_GRADLE_PROJECT_SIGNING_PWD: ${{ secrets.ORG_GRADLE_PROJECT_SIGNING_PWD }}
+        ORG_GRADLE_PROJECT_SIGNING_KEY: ${{ secrets.ORG_GRADLE_PROJECT_SIGNING_KEY }}
+        ORG_GRADLE_PROJECT_SONATYPE_USERNAME: ${{ secrets.ORG_GRADLE_PROJECT_SONATYPE_USERNAME }}
+        ORG_GRADLE_PROJECT_SONATYPE_PASSWORD: ${{ secrets.ORG_GRADLE_PROJECT_SONATYPE_PASSWORD }}
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+      - name: Build Android
+        uses: ./.github/actions/build-android
+        with:
+          release-type: ${{ needs.set_release_type.outputs.RELEASE_TYPE }}
+          gradle-cache-encryption-key: ${{ secrets.GRADLE_CACHE_ENCRYPTION_KEY }}
+
   build_npm_package:
     runs-on: 8-core-ubuntu
     needs:
@@ -149,6 +170,7 @@ jobs:
         build_hermes_macos,
         build_hermesc_linux,
         build_hermesc_windows,
+        build_android,
         prebuild_apple_dependencies,
         prebuild_react_native_core,
       ]

.github/workflows/stale-bot.yml

@@ -14,8 +14,8 @@ jobs:
         with:
           repo-token: ${{ secrets.REACT_NATIVE_BOT_GITHUB_TOKEN }}
           days-before-stale: 180
-          stale-issue-message: 'This issue is stale because it has been open for 180 days with no activity. It will be closed in 7 days unless you comment on it or remove the "Stale" label.'
-          stale-pr-message: 'This PR is stale because it has been open for 180 days with no activity. It will be closed in 7 days unless you comment on it or remove the "Stale" label.'
+          stale-issue-message: 'This issue is stale because it has been open 180 days with no activity. Remove stale label or comment or this will be closed in 7 days.'
+          stale-pr-message: 'This PR is stale because it has been open 180 days with no activity. Remove stale label or comment or this will be closed in 7 days.'
           close-issue-message: 'This issue was closed because it has been stalled for 7 days with no activity.'
           close-pr-message: 'This PR was closed because it has been stalled for 7 days with no activity.'
           exempt-issue-labels: 'Help Wanted :octocat:, Good first issue, Never gets stale, Issue: Author Provided Repro'

.gitignore

@@ -139,6 +139,7 @@ vendor/
 /packages/react-native/React/FBReactNativeSpec/
 /packages/react-native-codegen/lib
 /packages/react-native-codegen/tmp/
+/packages/react-native/ReactCommon/react/renderer/components/rncore/
 /packages/rn-tester/NativeModuleExample/ScreenshotManagerSpec*
 /**/RCTThirdPartyFabricComponentsProvider.*
 

build.gradle.kts

@@ -124,7 +124,7 @@ if (project.findProperty("react.internal.useHermesNightly")?.toString()?.toBoole
     configurations.all {
       resolutionStrategy.dependencySubstitution {
         substitute(project(":packages:react-native:ReactAndroid:hermes-engine"))
-            .using(module("com.facebook.react:hermes-android:0.+"))
+            .using(module("com.facebook.react:hermes-android:0.0.0-+"))
             .because("Users opted to use hermes from nightly")
       }
     }

package.json

@@ -17,6 +17,7 @@
     "format": "npm run prettier && npm run clang-format",
     "featureflags": "yarn --cwd packages/react-native featureflags",
     "lint-ci": "./.github/workflow-scripts/analyze_code.sh && yarn shellcheck",
+    "lint-java": "node ./scripts/lint-java.js",
     "lint-markdown": "markdownlint-cli2 2>&1",
     "lint": "eslint --max-warnings 0 .",
     "prettier": "prettier --write \"./**/*.{js,md,yml,ts,tsx}\"",
@@ -54,11 +55,11 @@
     "@react-native/metro-babel-transformer": "0.80.0-main",
     "@react-native/metro-config": "0.80.0-main",
     "@tsconfig/node22": "22.0.2",
-    "@types/react": "^19.1.0",
+    "@types/react": "^19.0.0",
     "@typescript-eslint/parser": "^7.1.1",
     "ansi-styles": "^4.2.1",
     "babel-plugin-minify-dead-code-elimination": "^0.5.2",
-    "babel-plugin-syntax-hermes-parser": "0.29.0",
+    "babel-plugin-syntax-hermes-parser": "0.28.1",
     "babel-plugin-transform-define": "^2.1.4",
     "babel-plugin-transform-flow-enums": "^0.0.2",
     "clang-format": "^1.8.0",
@@ -76,11 +77,11 @@
     "eslint-plugin-react-native": "^4.0.0",
     "eslint-plugin-redundant-undefined": "^0.4.0",
     "eslint-plugin-relay": "^1.8.3",
-    "flow-api-translator": "0.29.0",
-    "flow-bin": "^0.274.0",
+    "flow-api-translator": "0.28.1",
+    "flow-bin": "^0.273.1",
     "glob": "^7.1.1",
-    "hermes-eslint": "0.29.0",
-    "hermes-transform": "0.29.0",
+    "hermes-eslint": "0.28.1",
+    "hermes-transform": "0.28.1",
     "inquirer": "^7.1.0",
     "jest": "^29.7.0",
     "jest-config": "^29.7.0",
@@ -96,7 +97,7 @@
     "node-fetch": "^2.2.0",
     "nullthrows": "^1.1.1",
     "prettier": "2.8.8",
-    "prettier-plugin-hermes-parser": "0.29.0",
+    "prettier-plugin-hermes-parser": "0.28.1",
     "react": "19.1.0",
     "react-test-renderer": "19.1.0",
     "rimraf": "^3.0.2",

packages/debugger-frontend/BUILD_INFO

@@ -1,5 +1,5 @@
-@generated SignedSource<<cf5be4596d1f07e220b710fc286d02fa>>
-Git revision: d95ac13bf0ab64a5e6c2eb18eb138587063b9c34
+@generated SignedSource<<9ada78dff12dcfc7937c8934261f47f4>>
+Git revision: 68cfd0ae84acb0ed8e47b421afd64ae3b0b5b727
 Built with --nohooks: false
 Is local checkout: false
 Remote URL: https://github.com/facebook/react-native-devtools-frontend

packages/dev-middleware/src/__tests__/StandaloneFuseboxShell-test.js

@@ -9,7 +9,6 @@
  */
 
 import type {JsonPagesListResponse} from '../inspector-proxy/types';
-import type {BrowserLauncher} from '../types/BrowserLauncher';
 
 import DefaultBrowserLauncher from '../utils/DefaultBrowserLauncher';
 import {fetchJson, requestLocal} from './FetchUtils';
@@ -23,7 +22,7 @@ const PAGES_POLLING_DELAY = 2100;
 jest.useFakeTimers();
 
 describe('enableStandaloneFuseboxShell experiment', () => {
-  const BrowserLauncherWithFuseboxShell: BrowserLauncher = {
+  const BrowserLauncherWithFuseboxShell = {
     ...DefaultBrowserLauncher,
     unstable_showFuseboxShell: () => {
       throw new Error('Not implemented');

packages/dev-middleware/src/createDevMiddleware.js

@@ -81,7 +81,6 @@ export default function createDevMiddleware({
   projectRoot,
   serverBaseUrl,
   logger,
-  // $FlowFixMe[prop-missing]
   unstable_browserLauncher = DefaultBrowserLauncher,
   unstable_eventReporter,
   unstable_experiments: experimentConfig = {},

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

@@ -18,8 +18,8 @@
   "bugs": "https://github.com/facebook/react-native/issues",
   "main": "index.js",
   "devDependencies": {
-    "babel-plugin-syntax-hermes-parser": "0.29.0",
-    "hermes-eslint": "0.29.0"
+    "babel-plugin-syntax-hermes-parser": "0.28.1",
+    "hermes-eslint": "0.28.1"
   },
   "engines": {
     "node": ">= 22.14.0"

packages/eslint-plugin-specs/package.json

@@ -32,8 +32,8 @@
     "source-map-support": "0.5.0"
   },
   "devDependencies": {
-    "babel-plugin-syntax-hermes-parser": "0.29.0",
-    "hermes-eslint": "0.29.0"
+    "babel-plugin-syntax-hermes-parser": "0.28.1",
+    "hermes-eslint": "0.28.1"
   },
   "engines": {
     "node": ">= 22.14.0"

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

@@ -1,5 +1,5 @@
 [versions]
-agp = "8.11.0"
+agp = "8.10.1"
 gson = "2.8.9"
 guava = "31.0.1-jre"
 javapoet = "1.13.0"

packages/gradle-plugin/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/tasks/internal/PrepareGflagsTask.kt

@@ -1,116 +0,0 @@
-/*
- * Copyright (c) Meta Platforms, Inc. and affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- */
-
-package com.facebook.react.tasks.internal
-
-import javax.inject.Inject
-import org.gradle.api.DefaultTask
-import org.gradle.api.file.ConfigurableFileCollection
-import org.gradle.api.file.CopySpec
-import org.gradle.api.file.DirectoryProperty
-import org.gradle.api.file.DuplicatesStrategy
-import org.gradle.api.file.FileSystemOperations
-import org.gradle.api.provider.Property
-import org.gradle.api.tasks.*
-
-/**
- * A task that takes care of extracting gflags from a source folder/zip and preparing it to be
- * consumed by the NDK. This task will also take care of applying the mapping for gflags parameters.
- */
-abstract class PrepareGflagsTask : DefaultTask() {
-
-  @get:InputFiles abstract val gflagsPath: ConfigurableFileCollection
-  @get:InputDirectory abstract val gflagsThirdPartyPath: DirectoryProperty
-  @get:Input abstract val gflagsVersion: Property<String>
-
-  @get:OutputDirectory abstract val outputDir: DirectoryProperty
-
-  @get:Inject abstract val fs: FileSystemOperations
-
-  @TaskAction
-  fun taskAction() {
-    val commonCopyConfig: (action: CopySpec) -> Unit = { action ->
-      action.from(gflagsPath)
-      action.from(gflagsThirdPartyPath)
-      action.duplicatesStrategy = DuplicatesStrategy.INCLUDE
-      action.includeEmptyDirs = false
-      action.into(outputDir)
-    }
-
-    fs.copy { action ->
-      commonCopyConfig(action)
-      action.include(
-          "gflags-${gflagsVersion.get()}/src/*.h",
-          "gflags-${gflagsVersion.get()}/src/*.cc",
-          "CMakeLists.txt")
-      action.filesMatching("*/src/*") { matchedFile ->
-        matchedFile.path = "gflags/${matchedFile.name}"
-      }
-    }
-
-    fs.copy { action ->
-      commonCopyConfig(action)
-      action.include("gflags-${gflagsVersion.get()}/src/gflags_declare.h.in")
-      action.filesMatching("*/src/*") { matchedFile ->
-        matchedFile.filter { line ->
-          // Replace all placeholders with appropriate values
-          // see https://github.com/gflags/gflags/blob/v2.2.0/src/gflags_declare.h.in
-          line
-              .replace(Regex("@GFLAGS_NAMESPACE@"), "gflags")
-              .replace(
-                  Regex(
-                      "@(HAVE_STDINT_H|HAVE_SYS_TYPES_H|HAVE_INTTYPES_H|GFLAGS_INTTYPES_FORMAT_C99)@"),
-                  "1")
-              .replace(Regex("@([A-Z0-9_]+)@"), "1")
-        }
-        matchedFile.path = "gflags/${matchedFile.name.removeSuffix(".in")}"
-      }
-    }
-
-    fs.copy { action ->
-      commonCopyConfig(action)
-      action.include("gflags-${gflagsVersion.get()}/src/config.h.in")
-      action.filesMatching("*/src/*") { matchedFile ->
-        matchedFile.filter { line -> line.replace(Regex("^#cmakedefine"), "//cmakedefine") }
-        matchedFile.path = "gflags/${matchedFile.name.removeSuffix(".in")}"
-      }
-    }
-
-    fs.copy { action ->
-      commonCopyConfig(action)
-      action.include("gflags-${gflagsVersion.get()}/src/gflags_ns.h.in")
-      action.filesMatching("*/src/*") { matchedFile ->
-        matchedFile.filter { line ->
-          line.replace(Regex("@ns@"), "google").replace(Regex("@NS@"), "google".uppercase())
-        }
-        matchedFile.path = "gflags/gflags_google.h"
-      }
-    }
-
-    fs.copy { action ->
-      commonCopyConfig(action)
-      action.include("gflags-${gflagsVersion.get()}/src/gflags.h.in")
-      action.filesMatching("*/src/*") { matchedFile ->
-        matchedFile.filter { line ->
-          line
-              .replace(Regex("@GFLAGS_ATTRIBUTE_UNUSED@"), "")
-              .replace(Regex("@INCLUDE_GFLAGS_NS_H@"), "#include \"gflags/gflags_google.h\"")
-        }
-        matchedFile.path = "gflags/${matchedFile.name.removeSuffix(".in")}"
-      }
-    }
-
-    fs.copy { action ->
-      commonCopyConfig(action)
-      action.include("gflags-${gflagsVersion.get()}/src/gflags_completions.h.in")
-      action.filesMatching("*/src/*") { matchedFile ->
-        matchedFile.filter { line -> line.replace(Regex("@GFLAGS_NAMESPACE@"), "gflags") }
-        matchedFile.path = "gflags/${matchedFile.name.removeSuffix(".in")}"
-      }
-    }
-  }
-}

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

@@ -126,8 +126,6 @@ internal object NdkConfiguratorUtils {
   ): Pair<List<String>, List<String>> {
     val excludes = mutableListOf<String>()
     val includes = mutableListOf<String>()
-
-    // note: libjsctooling.so is kept here for backward compatibility.
     when {
       hermesEnabled -> {
         excludes.add("**/libjsc.so")

packages/gradle-plugin/react-native-gradle-plugin/src/test/kotlin/com/facebook/react/tasks/internal/PrepareGflagsTaskTest.kt

@@ -1,209 +0,0 @@
-/*
- * Copyright (c) Meta Platforms, Inc. and affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- */
-
-package com.facebook.react.tasks.internal
-
-import com.facebook.react.tests.createProject
-import com.facebook.react.tests.createTestTask
-import java.io.*
-import org.assertj.core.api.Assertions.assertThat
-import org.junit.Assert.assertEquals
-import org.junit.Rule
-import org.junit.Test
-import org.junit.rules.TemporaryFolder
-
-class PrepareGflagsTaskTest {
-
-  @get:Rule val tempFolder = TemporaryFolder()
-
-  @Test(expected = IllegalStateException::class)
-  fun prepareGflagsTask_withMissingConfiguration_fails() {
-    val task = createTestTask<PrepareGflagsTask>()
-
-    task.taskAction()
-  }
-
-  @Test
-  fun prepareGflagsTask_copiesCMakefile() {
-    val gflagspath = tempFolder.newFolder("gflagspath")
-    val output = tempFolder.newFolder("output")
-    val project = createProject()
-    val gflagsThirdPartyPath = File(project.projectDir, "src/main/jni/third-party/gflags/")
-    val task =
-        createTestTask<PrepareGflagsTask>(project = project) {
-          it.gflagsPath.setFrom(gflagspath)
-          it.gflagsThirdPartyPath.set(gflagsThirdPartyPath)
-          it.gflagsVersion.set("1.0.0")
-          it.outputDir.set(output)
-        }
-    File(gflagsThirdPartyPath, "CMakeLists.txt").apply {
-      parentFile.mkdirs()
-      createNewFile()
-    }
-    task.taskAction()
-
-    assertThat(output.listFiles()!!.any { it.name == "CMakeLists.txt" }).isTrue()
-  }
-
-  @Test
-  fun prepareGflagsTask_copiesSourceCodeAndHeaders() {
-    val gflagspath = tempFolder.newFolder("gflagspath")
-    val gflagsThirdPartyPath = tempFolder.newFolder("gflagspath/jni")
-    val output = tempFolder.newFolder("output")
-    val task =
-        createTestTask<PrepareGflagsTask> {
-          it.gflagsPath.setFrom(gflagspath)
-          it.gflagsThirdPartyPath.set(gflagsThirdPartyPath)
-          it.gflagsVersion.set("1.0.0")
-          it.outputDir.set(output)
-        }
-    File(gflagspath, "gflags-1.0.0/src/gflags.cc").apply {
-      parentFile.mkdirs()
-      createNewFile()
-    }
-    File(gflagspath, "gflags-1.0.0/src/util.h").apply {
-      parentFile.mkdirs()
-      createNewFile()
-    }
-
-    task.taskAction()
-
-    assertThat(File(output, "gflags/gflags.cc").exists()).isTrue()
-    assertThat(File(output, "gflags/util.h").exists()).isTrue()
-  }
-
-  @Test
-  fun prepareGflagsTask_replacesTokenCorrectly() {
-    val gflagspath = tempFolder.newFolder("gflagspath")
-    val gflagsThirdPartyPath = tempFolder.newFolder("gflagspath/jni")
-    val output = tempFolder.newFolder("output")
-    val task =
-        createTestTask<PrepareGflagsTask> {
-          it.gflagsPath.setFrom(gflagspath)
-          it.gflagsThirdPartyPath.set(gflagsThirdPartyPath)
-          it.gflagsVersion.set("1.0.0")
-          it.outputDir.set(output)
-        }
-    File(gflagspath, "gflags-1.0.0/src/gflags_declare.h.in").apply {
-      parentFile.mkdirs()
-      writeText(
-          """
-#define GFLAGS_NAMESPACE @GFLAGS_NAMESPACE@
-#include <string>
-#if @HAVE_STDINT_H@
-#  include <stdint.h>
-#elif @HAVE_SYS_TYPES_H@
-#  include <sys/types.h>
-#elif @HAVE_INTTYPES_H@
-#  include <inttypes.h>
-#endif
-
-
-namespace GFLAGS_NAMESPACE {
-
-#if @GFLAGS_INTTYPES_FORMAT_C99@ // C99
-typedef int32_t          int32;
-typedef uint32_t         uint32;
-typedef int64_t          int64;
-typedef uint64_t         uint64;
-#elif @GFLAGS_INTTYPES_FORMAT_BSD@ // BSD
-typedef int32_t          int32;
-typedef u_int32_t        uint32;
-typedef int64_t          int64;
-typedef u_int64_t        uint64;
-#elif @GFLAGS_INTTYPES_FORMAT_VC7@ // Windows
-typedef __int32          int32;
-typedef unsigned __int32 uint32;
-typedef __int64          int64;
-typedef unsigned __int64 uint64;
-#else
-#  error Do not know how to define a 32-bit integer quantity on your system
-#endif
-
-} // namespace GFLAGS_NAMESPACE
-""")
-    }
-    File(gflagspath, "gflags-1.0.0/src/config.h.in").apply {
-      parentFile.mkdirs()
-      createNewFile()
-      writeText("#cmakedefine")
-    }
-    File(gflagspath, "gflags-1.0.0/src/gflags_ns.h.in").apply {
-      parentFile.mkdirs()
-      createNewFile()
-      writeText("@ns@ @NS@")
-    }
-    File(gflagspath, "gflags-1.0.0/src/gflags.h.in").apply {
-      parentFile.mkdirs()
-      createNewFile()
-      writeText("@GFLAGS_ATTRIBUTE_UNUSED@\n@INCLUDE_GFLAGS_NS_H@")
-    }
-    File(gflagspath, "gflags-1.0.0/src/gflags_completions.h.in").apply {
-      parentFile.mkdirs()
-      createNewFile()
-      writeText("@GFLAGS_NAMESPACE@")
-    }
-
-    task.taskAction()
-
-    val declareFile = File(output, "gflags/gflags_declare.h")
-    assertThat(declareFile.exists()).isTrue()
-    assertEquals(
-        declareFile.readText(),
-        """
-#define GFLAGS_NAMESPACE gflags
-#include <string>
-#if 1
-#  include <stdint.h>
-#elif 1
-#  include <sys/types.h>
-#elif 1
-#  include <inttypes.h>
-#endif
-
-
-namespace GFLAGS_NAMESPACE {
-
-#if 1 // C99
-typedef int32_t          int32;
-typedef uint32_t         uint32;
-typedef int64_t          int64;
-typedef uint64_t         uint64;
-#elif 1 // BSD
-typedef int32_t          int32;
-typedef u_int32_t        uint32;
-typedef int64_t          int64;
-typedef u_int64_t        uint64;
-#elif 1 // Windows
-typedef __int32          int32;
-typedef unsigned __int32 uint32;
-typedef __int64          int64;
-typedef unsigned __int64 uint64;
-#else
-#  error Do not know how to define a 32-bit integer quantity on your system
-#endif
-
-} // namespace GFLAGS_NAMESPACE
-""")
-
-    val configFile = File(output, "gflags/config.h")
-    assertThat(configFile.exists()).isTrue()
-    assertEquals(configFile.readText(), "//cmakedefine")
-
-    val nsFile = File(output, "gflags/gflags_google.h")
-    assertThat(nsFile.exists()).isTrue()
-    assertEquals(nsFile.readText(), "google GOOGLE")
-
-    val gflagsFile = File(output, "gflags/gflags.h")
-    assertThat(gflagsFile.exists()).isTrue()
-    assertEquals(gflagsFile.readText(), "\n#include \"gflags/gflags_google.h\"")
-
-    val completionsFile = File(output, "gflags/gflags_completions.h")
-    assertThat(completionsFile.exists()).isTrue()
-    assertEquals(completionsFile.readText(), "gflags")
-  }
-}

packages/new-app-screen/package.json

@@ -20,7 +20,7 @@
   ],
   "dependencies": {},
   "peerDependencies": {
-    "@types/react": "^19.1.0",
+    "@types/react": "^19.0.0",
     "react": "*",
     "react-native": "*"
   },

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

@@ -67,7 +67,7 @@
     "@babel/plugin-transform-unicode-regex": "^7.24.7",
     "@babel/template": "^7.25.0",
     "@react-native/babel-plugin-codegen": "0.80.0-main",
-    "babel-plugin-syntax-hermes-parser": "0.29.0",
+    "babel-plugin-syntax-hermes-parser": "0.28.1",
     "babel-plugin-transform-flow-enums": "^0.0.2",
     "react-refresh": "^0.14.0"
   },

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

@@ -15,9 +15,8 @@ const lazyImports = require('./lazy-imports');
 
 const EXCLUDED_FIRST_PARTY_PATHS = [
   /[/\\]node_modules[/\\]/,
-  /[/\\]packages[/\\]react-native[/\\]/,
+  /[/\\]packages[/\\]react-native(?:-fantom)?[/\\]/,
   /[/\\]packages[/\\]virtualized-lists[/\\]/,
-  /[/\\]private[/\\]react-native-fantom[/\\]/,
 ];
 
 function isTypeScriptSource(fileName) {

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

@@ -28,7 +28,7 @@
   "dependencies": {
     "@babel/core": "^7.25.2",
     "@react-native/babel-preset": "0.80.0-main",
-    "hermes-parser": "0.29.0",
+    "hermes-parser": "0.28.1",
     "nullthrows": "^1.1.1"
   },
   "peerDependencies": {

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

@@ -40,10 +40,6 @@ ArrayPropsNativeComponentViewProps::ArrayPropsNativeComponentViewProps(
     arrayOfMixed(convertRawProp(context, rawProps, \\"arrayOfMixed\\", sourceProps.arrayOfMixed, {})) {}
     
 #ifdef RN_SERIALIZABLE_STATE
-ComponentName ArrayPropsNativeComponentViewProps::getDiffPropsImplementationTarget() const {
-  return \\"ArrayPropsNativeComponentView\\";
-}
-
 folly::dynamic ArrayPropsNativeComponentViewProps::getDiffProps(
     const Props* prevProps) const {
   static const auto defaultProps = ArrayPropsNativeComponentViewProps();
@@ -55,57 +51,18 @@ folly::dynamic ArrayPropsNativeComponentViewProps::getDiffProps(
   }
   folly::dynamic result = HostPlatformViewProps::getDiffProps(prevProps);
   
-  if (names != oldProps->names) {
-    result[\\"names\\"] = toDynamic(names);
-  }
     
-  if (disableds != oldProps->disableds) {
-    result[\\"disableds\\"] = toDynamic(disableds);
-  }
     
-  if (progress != oldProps->progress) {
-    result[\\"progress\\"] = toDynamic(progress);
-  }
     
-  if (radii != oldProps->radii) {
-    result[\\"radii\\"] = toDynamic(radii);
-  }
     
-  if (colors != oldProps->colors) {
-    result[\\"colors\\"] = toDynamic(colors);
-  }
     
-  if (srcs != oldProps->srcs) {
-    result[\\"srcs\\"] = toDynamic(srcs);
-  }
     
-  if (points != oldProps->points) {
-    result[\\"points\\"] = toDynamic(points);
-  }
     
-  if (edgeInsets != oldProps->edgeInsets) {
-    result[\\"edgeInsets\\"] = toDynamic(edgeInsets);
-  }
     
-  if (dimensions != oldProps->dimensions) {
-    result[\\"dimensions\\"] = toDynamic(dimensions);
-  }
     
-  if (sizes != oldProps->sizes) {
-    result[\\"sizes\\"] = toDynamic(sizes);
-  }
     
-  if (object != oldProps->object) {
-    result[\\"object\\"] = toDynamic(object);
-  }
     
-  if (arrayOfObjects != oldProps->arrayOfObjects) {
-    result[\\"arrayOfObjects\\"] = toDynamic(arrayOfObjects);
-  }
     
-  if (arrayOfMixed != oldProps->arrayOfMixed) {
-    result[\\"arrayOfMixed\\"] = toDynamic(arrayOfMixed);
-  }
   return result;
 }
 #endif
@@ -142,10 +99,6 @@ BooleanPropNativeComponentViewProps::BooleanPropNativeComponentViewProps(
     disabledNullable(convertRawProp(context, rawProps, \\"disabledNullable\\", sourceProps.disabledNullable, {})) {}
     
 #ifdef RN_SERIALIZABLE_STATE
-ComponentName BooleanPropNativeComponentViewProps::getDiffPropsImplementationTarget() const {
-  return \\"BooleanPropNativeComponentView\\";
-}
-
 folly::dynamic BooleanPropNativeComponentViewProps::getDiffProps(
     const Props* prevProps) const {
   static const auto defaultProps = BooleanPropNativeComponentViewProps();
@@ -199,10 +152,6 @@ ColorPropNativeComponentViewProps::ColorPropNativeComponentViewProps(
     tintColor(convertRawProp(context, rawProps, \\"tintColor\\", sourceProps.tintColor, {})) {}
     
 #ifdef RN_SERIALIZABLE_STATE
-ComponentName ColorPropNativeComponentViewProps::getDiffPropsImplementationTarget() const {
-  return \\"ColorPropNativeComponentView\\";
-}
-
 folly::dynamic ColorPropNativeComponentViewProps::getDiffProps(
     const Props* prevProps) const {
   static const auto defaultProps = ColorPropNativeComponentViewProps();
@@ -253,10 +202,6 @@ DimensionPropNativeComponentViewProps::DimensionPropNativeComponentViewProps(
     marginBack(convertRawProp(context, rawProps, \\"marginBack\\", sourceProps.marginBack, {})) {}
     
 #ifdef RN_SERIALIZABLE_STATE
-ComponentName DimensionPropNativeComponentViewProps::getDiffPropsImplementationTarget() const {
-  return \\"DimensionPropNativeComponentView\\";
-}
-
 folly::dynamic DimensionPropNativeComponentViewProps::getDiffProps(
     const Props* prevProps) const {
   static const auto defaultProps = DimensionPropNativeComponentViewProps();
@@ -268,9 +213,6 @@ folly::dynamic DimensionPropNativeComponentViewProps::getDiffProps(
   }
   folly::dynamic result = HostPlatformViewProps::getDiffProps(prevProps);
   
-  if (marginBack != oldProps->marginBack) {
-    result[\\"marginBack\\"] = toDynamic(marginBack);
-  }
   return result;
 }
 #endif
@@ -306,10 +248,6 @@ EdgeInsetsPropNativeComponentViewProps::EdgeInsetsPropNativeComponentViewProps(
      {}
     
 #ifdef RN_SERIALIZABLE_STATE
-ComponentName EdgeInsetsPropNativeComponentViewProps::getDiffPropsImplementationTarget() const {
-  return \\"EdgeInsetsPropNativeComponentView\\";
-}
-
 folly::dynamic EdgeInsetsPropNativeComponentViewProps::getDiffProps(
     const Props* prevProps) const {
   static const auto defaultProps = EdgeInsetsPropNativeComponentViewProps();
@@ -357,10 +295,6 @@ EnumPropNativeComponentViewProps::EnumPropNativeComponentViewProps(
     intervals(convertRawProp(context, rawProps, \\"intervals\\", sourceProps.intervals, {EnumPropNativeComponentViewIntervals::Intervals0})) {}
     
 #ifdef RN_SERIALIZABLE_STATE
-ComponentName EnumPropNativeComponentViewProps::getDiffPropsImplementationTarget() const {
-  return \\"EnumPropNativeComponentView\\";
-}
-
 folly::dynamic EnumPropNativeComponentViewProps::getDiffProps(
     const Props* prevProps) const {
   static const auto defaultProps = EnumPropNativeComponentViewProps();
@@ -372,13 +306,7 @@ folly::dynamic EnumPropNativeComponentViewProps::getDiffProps(
   }
   folly::dynamic result = HostPlatformViewProps::getDiffProps(prevProps);
   
-  if (alignment != oldProps->alignment) {
-    result[\\"alignment\\"] = toDynamic(alignment);
-  }
     
-  if (intervals != oldProps->intervals) {
-    result[\\"intervals\\"] = toDynamic(intervals);
-  }
   return result;
 }
 #endif
@@ -414,10 +342,6 @@ EventNestedObjectPropsNativeComponentViewProps::EventNestedObjectPropsNativeComp
     disabled(convertRawProp(context, rawProps, \\"disabled\\", sourceProps.disabled, {false})) {}
     
 #ifdef RN_SERIALIZABLE_STATE
-ComponentName EventNestedObjectPropsNativeComponentViewProps::getDiffPropsImplementationTarget() const {
-  return \\"EventNestedObjectPropsNativeComponentView\\";
-}
-
 folly::dynamic EventNestedObjectPropsNativeComponentViewProps::getDiffProps(
     const Props* prevProps) const {
   static const auto defaultProps = EventNestedObjectPropsNativeComponentViewProps();
@@ -467,10 +391,6 @@ EventPropsNativeComponentViewProps::EventPropsNativeComponentViewProps(
     disabled(convertRawProp(context, rawProps, \\"disabled\\", sourceProps.disabled, {false})) {}
     
 #ifdef RN_SERIALIZABLE_STATE
-ComponentName EventPropsNativeComponentViewProps::getDiffPropsImplementationTarget() const {
-  return \\"EventPropsNativeComponentView\\";
-}
-
 folly::dynamic EventPropsNativeComponentViewProps::getDiffProps(
     const Props* prevProps) const {
   static const auto defaultProps = EventPropsNativeComponentViewProps();
@@ -526,10 +446,6 @@ FloatPropsNativeComponentViewProps::FloatPropsNativeComponentViewProps(
     blurRadiusNullable(convertRawProp(context, rawProps, \\"blurRadiusNullable\\", sourceProps.blurRadiusNullable, {})) {}
     
 #ifdef RN_SERIALIZABLE_STATE
-ComponentName FloatPropsNativeComponentViewProps::getDiffPropsImplementationTarget() const {
-  return \\"FloatPropsNativeComponentView\\";
-}
-
 folly::dynamic FloatPropsNativeComponentViewProps::getDiffProps(
     const Props* prevProps) const {
   static const auto defaultProps = FloatPropsNativeComponentViewProps();
@@ -604,10 +520,6 @@ ImagePropNativeComponentViewProps::ImagePropNativeComponentViewProps(
     thumbImage(convertRawProp(context, rawProps, \\"thumbImage\\", sourceProps.thumbImage, {})) {}
     
 #ifdef RN_SERIALIZABLE_STATE
-ComponentName ImagePropNativeComponentViewProps::getDiffPropsImplementationTarget() const {
-  return \\"ImagePropNativeComponentView\\";
-}
-
 folly::dynamic ImagePropNativeComponentViewProps::getDiffProps(
     const Props* prevProps) const {
   static const auto defaultProps = ImagePropNativeComponentViewProps();
@@ -620,7 +532,7 @@ folly::dynamic ImagePropNativeComponentViewProps::getDiffProps(
   folly::dynamic result = HostPlatformViewProps::getDiffProps(prevProps);
   
   if (thumbImage != oldProps->thumbImage) {
-    result[\\"thumbImage\\"] = toDynamic(thumbImage);
+    result[\\"thumbImage\\"] = thumbImage.toDynamic();
   }
   return result;
 }
@@ -659,10 +571,6 @@ IntegerPropNativeComponentViewProps::IntegerPropNativeComponentViewProps(
     progress3(convertRawProp(context, rawProps, \\"progress3\\", sourceProps.progress3, {10})) {}
     
 #ifdef RN_SERIALIZABLE_STATE
-ComponentName IntegerPropNativeComponentViewProps::getDiffPropsImplementationTarget() const {
-  return \\"IntegerPropNativeComponentView\\";
-}
-
 folly::dynamic IntegerPropNativeComponentViewProps::getDiffProps(
     const Props* prevProps) const {
   static const auto defaultProps = IntegerPropNativeComponentViewProps();
@@ -720,10 +628,6 @@ InterfaceOnlyNativeComponentViewProps::InterfaceOnlyNativeComponentViewProps(
     title(convertRawProp(context, rawProps, \\"title\\", sourceProps.title, {\\"\\"})) {}
     
 #ifdef RN_SERIALIZABLE_STATE
-ComponentName InterfaceOnlyNativeComponentViewProps::getDiffPropsImplementationTarget() const {
-  return \\"InterfaceOnlyNativeComponentView\\";
-}
-
 folly::dynamic InterfaceOnlyNativeComponentViewProps::getDiffProps(
     const Props* prevProps) const {
   static const auto defaultProps = InterfaceOnlyNativeComponentViewProps();
@@ -774,10 +678,6 @@ MixedPropNativeComponentViewProps::MixedPropNativeComponentViewProps(
     mixedProp(convertRawProp(context, rawProps, \\"mixedProp\\", sourceProps.mixedProp, {})) {}
     
 #ifdef RN_SERIALIZABLE_STATE
-ComponentName MixedPropNativeComponentViewProps::getDiffPropsImplementationTarget() const {
-  return \\"MixedPropNativeComponentView\\";
-}
-
 folly::dynamic MixedPropNativeComponentViewProps::getDiffProps(
     const Props* prevProps) const {
   static const auto defaultProps = MixedPropNativeComponentViewProps();
@@ -789,9 +689,6 @@ folly::dynamic MixedPropNativeComponentViewProps::getDiffProps(
   }
   folly::dynamic result = HostPlatformViewProps::getDiffProps(prevProps);
   
-  if (mixedProp != oldProps->mixedProp) {
-    result[\\"mixedProp\\"] = mixedProp;
-  }
   return result;
 }
 #endif
@@ -831,10 +728,6 @@ MultiNativePropNativeComponentViewProps::MultiNativePropNativeComponentViewProps
     point(convertRawProp(context, rawProps, \\"point\\", sourceProps.point, {})) {}
     
 #ifdef RN_SERIALIZABLE_STATE
-ComponentName MultiNativePropNativeComponentViewProps::getDiffPropsImplementationTarget() const {
-  return \\"MultiNativePropNativeComponentView\\";
-}
-
 folly::dynamic MultiNativePropNativeComponentViewProps::getDiffProps(
     const Props* prevProps) const {
   static const auto defaultProps = MultiNativePropNativeComponentViewProps();
@@ -847,7 +740,7 @@ folly::dynamic MultiNativePropNativeComponentViewProps::getDiffProps(
   folly::dynamic result = HostPlatformViewProps::getDiffProps(prevProps);
   
   if (thumbImage != oldProps->thumbImage) {
-    result[\\"thumbImage\\"] = toDynamic(thumbImage);
+    result[\\"thumbImage\\"] = thumbImage.toDynamic();
   }
     
   if (color != oldProps->color) {
@@ -859,7 +752,10 @@ folly::dynamic MultiNativePropNativeComponentViewProps::getDiffProps(
   }
     
   if (point != oldProps->point) {
-    result[\\"point\\"] = toDynamic(point);
+    folly::dynamic pointResult = folly::dynamic::object();
+    pointResult[\\"x\\"] = point.x;
+    pointResult[\\"y\\"] = point.y;
+    result[\\"point\\"] = pointResult;
   }
   return result;
 }
@@ -896,10 +792,6 @@ NoPropsNoEventsNativeComponentViewProps::NoPropsNoEventsNativeComponentViewProps
      {}
     
 #ifdef RN_SERIALIZABLE_STATE
-ComponentName NoPropsNoEventsNativeComponentViewProps::getDiffPropsImplementationTarget() const {
-  return \\"NoPropsNoEventsNativeComponentView\\";
-}
-
 folly::dynamic NoPropsNoEventsNativeComponentViewProps::getDiffProps(
     const Props* prevProps) const {
   static const auto defaultProps = NoPropsNoEventsNativeComponentViewProps();
@@ -949,10 +841,6 @@ ObjectPropsNativeComponentProps::ObjectPropsNativeComponentProps(
     objectPrimitiveRequiredProp(convertRawProp(context, rawProps, \\"objectPrimitiveRequiredProp\\", sourceProps.objectPrimitiveRequiredProp, {})) {}
     
 #ifdef RN_SERIALIZABLE_STATE
-ComponentName ObjectPropsNativeComponentProps::getDiffPropsImplementationTarget() const {
-  return \\"ObjectPropsNativeComponent\\";
-}
-
 folly::dynamic ObjectPropsNativeComponentProps::getDiffProps(
     const Props* prevProps) const {
   static const auto defaultProps = ObjectPropsNativeComponentProps();
@@ -964,17 +852,8 @@ folly::dynamic ObjectPropsNativeComponentProps::getDiffProps(
   }
   folly::dynamic result = HostPlatformViewProps::getDiffProps(prevProps);
   
-  if (objectProp != oldProps->objectProp) {
-    result[\\"objectProp\\"] = toDynamic(objectProp);
-  }
     
-  if (objectArrayProp != oldProps->objectArrayProp) {
-    result[\\"objectArrayProp\\"] = toDynamic(objectArrayProp);
-  }
     
-  if (objectPrimitiveRequiredProp != oldProps->objectPrimitiveRequiredProp) {
-    result[\\"objectPrimitiveRequiredProp\\"] = toDynamic(objectPrimitiveRequiredProp);
-  }
   return result;
 }
 #endif
@@ -1010,10 +889,6 @@ PointPropNativeComponentViewProps::PointPropNativeComponentViewProps(
     startPoint(convertRawProp(context, rawProps, \\"startPoint\\", sourceProps.startPoint, {})) {}
     
 #ifdef RN_SERIALIZABLE_STATE
-ComponentName PointPropNativeComponentViewProps::getDiffPropsImplementationTarget() const {
-  return \\"PointPropNativeComponentView\\";
-}
-
 folly::dynamic PointPropNativeComponentViewProps::getDiffProps(
     const Props* prevProps) const {
   static const auto defaultProps = PointPropNativeComponentViewProps();
@@ -1026,7 +901,10 @@ folly::dynamic PointPropNativeComponentViewProps::getDiffProps(
   folly::dynamic result = HostPlatformViewProps::getDiffProps(prevProps);
   
   if (startPoint != oldProps->startPoint) {
-    result[\\"startPoint\\"] = toDynamic(startPoint);
+    folly::dynamic pointResult = folly::dynamic::object();
+    pointResult[\\"x\\"] = startPoint.x;
+    pointResult[\\"y\\"] = startPoint.y;
+    result[\\"startPoint\\"] = pointResult;
   }
   return result;
 }
@@ -1064,10 +942,6 @@ StringPropNativeComponentViewProps::StringPropNativeComponentViewProps(
     defaultValue(convertRawProp(context, rawProps, \\"defaultValue\\", sourceProps.defaultValue, {})) {}
     
 #ifdef RN_SERIALIZABLE_STATE
-ComponentName StringPropNativeComponentViewProps::getDiffPropsImplementationTarget() const {
-  return \\"StringPropNativeComponentView\\";
-}
-
 folly::dynamic StringPropNativeComponentViewProps::getDiffProps(
     const Props* prevProps) const {
   static const auto defaultProps = StringPropNativeComponentViewProps();

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

@@ -16,7 +16,6 @@ Object {
 #include <cinttypes>
 #include <react/renderer/components/view/ViewProps.h>
 #include <react/renderer/core/PropsParserContext.h>
-#include <react/renderer/core/graphicsConversions.h>
 #include <react/renderer/core/propsConversions.h>
 #include <react/renderer/graphics/Color.h>
 #include <react/renderer/graphics/Point.h>
@@ -88,16 +87,6 @@ static inline std::string toString(const ArrayPropsNativeComponentViewSizesMaskW
 }
 struct ArrayPropsNativeComponentViewObjectStruct {
   std::string prop{};
-
-#ifdef RN_SERIALIZABLE_STATE
-  bool operator==(const ArrayPropsNativeComponentViewObjectStruct&) const = default;
-
-  folly::dynamic toDynamic() const {
-    folly::dynamic result = folly::dynamic::object();
-    result[\\"prop\\"] = prop;
-    return result;
-  }
-#endif
 };
 
 static inline void fromRawValue(const PropsParserContext& context, const RawValue &value, ArrayPropsNativeComponentViewObjectStruct &result) {
@@ -113,12 +102,6 @@ static inline std::string toString(const ArrayPropsNativeComponentViewObjectStru
   return \\"[Object ArrayPropsNativeComponentViewObjectStruct]\\";
 }
 
-#ifdef RN_SERIALIZABLE_STATE
-static inline folly::dynamic toDynamic(const ArrayPropsNativeComponentViewObjectStruct &value) {
-  return value.toDynamic();
-}
-#endif
-
 static inline void fromRawValue(const PropsParserContext& context, const RawValue &value, std::vector<ArrayPropsNativeComponentViewObjectStruct> &result) {
   auto items = (std::vector<RawValue>)value;
   for (const auto &item : items) {
@@ -132,17 +115,6 @@ static inline void fromRawValue(const PropsParserContext& context, const RawValu
 struct ArrayPropsNativeComponentViewArrayOfObjectsStruct {
   Float prop1{0.0};
   int prop2{0};
-
-#ifdef RN_SERIALIZABLE_STATE
-  bool operator==(const ArrayPropsNativeComponentViewArrayOfObjectsStruct&) const = default;
-
-  folly::dynamic toDynamic() const {
-    folly::dynamic result = folly::dynamic::object();
-    result[\\"prop1\\"] = prop1;
-    result[\\"prop2\\"] = prop2;
-    return result;
-  }
-#endif
 };
 
 static inline void fromRawValue(const PropsParserContext& context, const RawValue &value, ArrayPropsNativeComponentViewArrayOfObjectsStruct &result) {
@@ -162,12 +134,6 @@ static inline std::string toString(const ArrayPropsNativeComponentViewArrayOfObj
   return \\"[Object ArrayPropsNativeComponentViewArrayOfObjectsStruct]\\";
 }
 
-#ifdef RN_SERIALIZABLE_STATE
-static inline folly::dynamic toDynamic(const ArrayPropsNativeComponentViewArrayOfObjectsStruct &value) {
-  return value.toDynamic();
-}
-#endif
-
 static inline void fromRawValue(const PropsParserContext& context, const RawValue &value, std::vector<ArrayPropsNativeComponentViewArrayOfObjectsStruct> &result) {
   auto items = (std::vector<RawValue>)value;
   for (const auto &item : items) {
@@ -199,8 +165,6 @@ class ArrayPropsNativeComponentViewProps final : public ViewProps {
   std::vector<folly::dynamic> arrayOfMixed{};
 
   #ifdef RN_SERIALIZABLE_STATE
-  ComponentName getDiffPropsImplementationTarget() const override;
-
   folly::dynamic getDiffProps(const Props* prevProps) const override;
   #endif
 };
@@ -239,8 +203,6 @@ class BooleanPropNativeComponentViewProps final : public ViewProps {
   bool disabledNullable{};
 
   #ifdef RN_SERIALIZABLE_STATE
-  ComponentName getDiffPropsImplementationTarget() const override;
-
   folly::dynamic getDiffProps(const Props* prevProps) const override;
   #endif
 };
@@ -279,8 +241,6 @@ class ColorPropNativeComponentViewProps final : public ViewProps {
   SharedColor tintColor{};
 
   #ifdef RN_SERIALIZABLE_STATE
-  ComponentName getDiffPropsImplementationTarget() const override;
-
   folly::dynamic getDiffProps(const Props* prevProps) const override;
   #endif
 };
@@ -305,7 +265,6 @@ Object {
 
 #include <react/renderer/components/view/ViewProps.h>
 #include <react/renderer/core/PropsParserContext.h>
-#include <react/renderer/core/graphicsConversions.h>
 #include <yoga/Yoga.h>
 
 namespace facebook::react {
@@ -320,8 +279,6 @@ class DimensionPropNativeComponentViewProps final : public ViewProps {
   YGValue marginBack{};
 
   #ifdef RN_SERIALIZABLE_STATE
-  ComponentName getDiffPropsImplementationTarget() const override;
-
   folly::dynamic getDiffProps(const Props* prevProps) const override;
   #endif
 };
@@ -359,8 +316,6 @@ class EdgeInsetsPropNativeComponentViewProps final : public ViewProps {
   
 
   #ifdef RN_SERIALIZABLE_STATE
-  ComponentName getDiffPropsImplementationTarget() const override;
-
   folly::dynamic getDiffProps(const Props* prevProps) const override;
   #endif
 };
@@ -405,12 +360,6 @@ static inline std::string toString(const EnumPropNativeComponentViewAlignment &v
     case EnumPropNativeComponentViewAlignment::BottomRight: return \\"bottom-right\\";
   }
 }
-
-#ifdef RN_SERIALIZABLE_STATE
-static inline folly::dynamic toDynamic(const EnumPropNativeComponentViewAlignment &value) {
-  return toString(value);
-}
-#endif
 enum class EnumPropNativeComponentViewIntervals { Intervals0 = 0, Intervals15 = 15, Intervals30 = 30, Intervals60 = 60 };
 
 static inline void fromRawValue(const PropsParserContext& context, const RawValue &value, EnumPropNativeComponentViewIntervals &result) {
@@ -442,17 +391,6 @@ static inline std::string toString(const EnumPropNativeComponentViewIntervals &v
   }
 }
 
-#ifdef RN_SERIALIZABLE_STATE
-static inline folly::dynamic toDynamic(const EnumPropNativeComponentViewIntervals &value) {
-  switch (value) {
-    case EnumPropNativeComponentViewIntervals::Intervals0: return 0;
-    case EnumPropNativeComponentViewIntervals::Intervals15: return 15;
-    case EnumPropNativeComponentViewIntervals::Intervals30: return 30;
-    case EnumPropNativeComponentViewIntervals::Intervals60: return 60;
-  }
-}
-#endif
-
 class EnumPropNativeComponentViewProps final : public ViewProps {
  public:
   EnumPropNativeComponentViewProps() = default;
@@ -464,8 +402,6 @@ class EnumPropNativeComponentViewProps final : public ViewProps {
   EnumPropNativeComponentViewIntervals intervals{EnumPropNativeComponentViewIntervals::Intervals0};
 
   #ifdef RN_SERIALIZABLE_STATE
-  ComponentName getDiffPropsImplementationTarget() const override;
-
   folly::dynamic getDiffProps(const Props* prevProps) const override;
   #endif
 };
@@ -503,8 +439,6 @@ class EventNestedObjectPropsNativeComponentViewProps final : public ViewProps {
   bool disabled{false};
 
   #ifdef RN_SERIALIZABLE_STATE
-  ComponentName getDiffPropsImplementationTarget() const override;
-
   folly::dynamic getDiffProps(const Props* prevProps) const override;
   #endif
 };
@@ -542,8 +476,6 @@ class EventPropsNativeComponentViewProps final : public ViewProps {
   bool disabled{false};
 
   #ifdef RN_SERIALIZABLE_STATE
-  ComponentName getDiffPropsImplementationTarget() const override;
-
   folly::dynamic getDiffProps(const Props* prevProps) const override;
   #endif
 };
@@ -587,8 +519,6 @@ class FloatPropsNativeComponentViewProps final : public ViewProps {
   Float blurRadiusNullable{};
 
   #ifdef RN_SERIALIZABLE_STATE
-  ComponentName getDiffPropsImplementationTarget() const override;
-
   folly::dynamic getDiffProps(const Props* prevProps) const override;
   #endif
 };
@@ -627,8 +557,6 @@ class ImagePropNativeComponentViewProps final : public ViewProps {
   ImageSource thumbImage{};
 
   #ifdef RN_SERIALIZABLE_STATE
-  ComponentName getDiffPropsImplementationTarget() const override;
-
   folly::dynamic getDiffProps(const Props* prevProps) const override;
   #endif
 };
@@ -668,8 +596,6 @@ class IntegerPropNativeComponentViewProps final : public ViewProps {
   int progress3{10};
 
   #ifdef RN_SERIALIZABLE_STATE
-  ComponentName getDiffPropsImplementationTarget() const override;
-
   folly::dynamic getDiffProps(const Props* prevProps) const override;
   #endif
 };
@@ -707,8 +633,6 @@ class InterfaceOnlyNativeComponentViewProps final : public ViewProps {
   std::string title{\\"\\"};
 
   #ifdef RN_SERIALIZABLE_STATE
-  ComponentName getDiffPropsImplementationTarget() const override;
-
   folly::dynamic getDiffProps(const Props* prevProps) const override;
   #endif
 };
@@ -746,8 +670,6 @@ class MixedPropNativeComponentViewProps final : public ViewProps {
   folly::dynamic mixedProp{};
 
   #ifdef RN_SERIALIZABLE_STATE
-  ComponentName getDiffPropsImplementationTarget() const override;
-
   folly::dynamic getDiffProps(const Props* prevProps) const override;
   #endif
 };
@@ -791,8 +713,6 @@ class MultiNativePropNativeComponentViewProps final : public ViewProps {
   Point point{};
 
   #ifdef RN_SERIALIZABLE_STATE
-  ComponentName getDiffPropsImplementationTarget() const override;
-
   folly::dynamic getDiffProps(const Props* prevProps) const override;
   #endif
 };
@@ -830,8 +750,6 @@ class NoPropsNoEventsNativeComponentViewProps final : public ViewProps {
   
 
   #ifdef RN_SERIALIZABLE_STATE
-  ComponentName getDiffPropsImplementationTarget() const override;
-
   folly::dynamic getDiffProps(const Props* prevProps) const override;
   #endif
 };
@@ -880,12 +798,6 @@ static inline std::string toString(const ObjectPropsNativeComponentStringEnumPro
     case ObjectPropsNativeComponentStringEnumProp::Large: return \\"large\\";
   }
 }
-
-#ifdef RN_SERIALIZABLE_STATE
-static inline folly::dynamic toDynamic(const ObjectPropsNativeComponentStringEnumProp &value) {
-  return toString(value);
-}
-#endif
 enum class ObjectPropsNativeComponentIntEnumProp { IntEnumProp0 = 0, IntEnumProp1 = 1 };
 
 static inline void fromRawValue(const PropsParserContext& context, const RawValue &value, ObjectPropsNativeComponentIntEnumProp &result) {
@@ -908,15 +820,6 @@ static inline std::string toString(const ObjectPropsNativeComponentIntEnumProp &
     case ObjectPropsNativeComponentIntEnumProp::IntEnumProp1: return \\"1\\";
   }
 }
-
-#ifdef RN_SERIALIZABLE_STATE
-static inline folly::dynamic toDynamic(const ObjectPropsNativeComponentIntEnumProp &value) {
-  switch (value) {
-    case ObjectPropsNativeComponentIntEnumProp::IntEnumProp0: return 0;
-    case ObjectPropsNativeComponentIntEnumProp::IntEnumProp1: return 1;
-  }
-}
-#endif
 struct ObjectPropsNativeComponentObjectPropStruct {
   std::string stringProp{\\"\\"};
   bool booleanProp{false};
@@ -924,21 +827,6 @@ struct ObjectPropsNativeComponentObjectPropStruct {
   int intProp{0};
   ObjectPropsNativeComponentStringEnumProp stringEnumProp{ObjectPropsNativeComponentStringEnumProp::Small};
   ObjectPropsNativeComponentIntEnumProp intEnumProp{ObjectPropsNativeComponentIntEnumProp::IntEnumProp0};
-
-#ifdef RN_SERIALIZABLE_STATE
-  bool operator==(const ObjectPropsNativeComponentObjectPropStruct&) const = default;
-
-  folly::dynamic toDynamic() const {
-    folly::dynamic result = folly::dynamic::object();
-    result[\\"stringProp\\"] = stringProp;
-    result[\\"booleanProp\\"] = booleanProp;
-    result[\\"floatProp\\"] = floatProp;
-    result[\\"intProp\\"] = intProp;
-    result[\\"stringEnumProp\\"] = ::facebook::react::toDynamic(stringEnumProp);
-    result[\\"intEnumProp\\"] = ::facebook::react::toDynamic(intEnumProp);
-    return result;
-  }
-#endif
 };
 
 static inline void fromRawValue(const PropsParserContext& context, const RawValue &value, ObjectPropsNativeComponentObjectPropStruct &result) {
@@ -974,24 +862,8 @@ static inline std::string toString(const ObjectPropsNativeComponentObjectPropStr
   return \\"[Object ObjectPropsNativeComponentObjectPropStruct]\\";
 }
 
-#ifdef RN_SERIALIZABLE_STATE
-static inline folly::dynamic toDynamic(const ObjectPropsNativeComponentObjectPropStruct &value) {
-  return value.toDynamic();
-}
-#endif
-
 struct ObjectPropsNativeComponentObjectArrayPropStruct {
   std::vector<std::string> array{};
-
-#ifdef RN_SERIALIZABLE_STATE
-  bool operator==(const ObjectPropsNativeComponentObjectArrayPropStruct&) const = default;
-
-  folly::dynamic toDynamic() const {
-    folly::dynamic result = folly::dynamic::object();
-    result[\\"array\\"] = ::facebook::react::toDynamic(array);
-    return result;
-  }
-#endif
 };
 
 static inline void fromRawValue(const PropsParserContext& context, const RawValue &value, ObjectPropsNativeComponentObjectArrayPropStruct &result) {
@@ -1007,28 +879,10 @@ static inline std::string toString(const ObjectPropsNativeComponentObjectArrayPr
   return \\"[Object ObjectPropsNativeComponentObjectArrayPropStruct]\\";
 }
 
-#ifdef RN_SERIALIZABLE_STATE
-static inline folly::dynamic toDynamic(const ObjectPropsNativeComponentObjectArrayPropStruct &value) {
-  return value.toDynamic();
-}
-#endif
-
 struct ObjectPropsNativeComponentObjectPrimitiveRequiredPropStruct {
   ImageSource image{};
   SharedColor color{};
   Point point{};
-
-#ifdef RN_SERIALIZABLE_STATE
-  bool operator==(const ObjectPropsNativeComponentObjectPrimitiveRequiredPropStruct&) const = default;
-
-  folly::dynamic toDynamic() const {
-    folly::dynamic result = folly::dynamic::object();
-    result[\\"image\\"] = ::facebook::react::toDynamic(image);
-    result[\\"color\\"] = ::facebook::react::toDynamic(color);
-    result[\\"point\\"] = ::facebook::react::toDynamic(point);
-    return result;
-  }
-#endif
 };
 
 static inline void fromRawValue(const PropsParserContext& context, const RawValue &value, ObjectPropsNativeComponentObjectPrimitiveRequiredPropStruct &result) {
@@ -1051,12 +905,6 @@ static inline void fromRawValue(const PropsParserContext& context, const RawValu
 static inline std::string toString(const ObjectPropsNativeComponentObjectPrimitiveRequiredPropStruct &value) {
   return \\"[Object ObjectPropsNativeComponentObjectPrimitiveRequiredPropStruct]\\";
 }
-
-#ifdef RN_SERIALIZABLE_STATE
-static inline folly::dynamic toDynamic(const ObjectPropsNativeComponentObjectPrimitiveRequiredPropStruct &value) {
-  return value.toDynamic();
-}
-#endif
 class ObjectPropsNativeComponentProps final : public ViewProps {
  public:
   ObjectPropsNativeComponentProps() = default;
@@ -1069,8 +917,6 @@ class ObjectPropsNativeComponentProps final : public ViewProps {
   ObjectPropsNativeComponentObjectPrimitiveRequiredPropStruct objectPrimitiveRequiredProp{};
 
   #ifdef RN_SERIALIZABLE_STATE
-  ComponentName getDiffPropsImplementationTarget() const override;
-
   folly::dynamic getDiffProps(const Props* prevProps) const override;
   #endif
 };
@@ -1109,8 +955,6 @@ class PointPropNativeComponentViewProps final : public ViewProps {
   Point startPoint{};
 
   #ifdef RN_SERIALIZABLE_STATE
-  ComponentName getDiffPropsImplementationTarget() const override;
-
   folly::dynamic getDiffProps(const Props* prevProps) const override;
   #endif
 };
@@ -1149,8 +993,6 @@ class StringPropNativeComponentViewProps final : public ViewProps {
   std::string defaultValue{};
 
   #ifdef RN_SERIALIZABLE_STATE
-  ComponentName getDiffPropsImplementationTarget() const override;
-
   folly::dynamic getDiffProps(const Props* prevProps) const override;
   #endif
 };

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

@@ -40,10 +40,6 @@ ArrayPropsNativeComponentViewProps::ArrayPropsNativeComponentViewProps(
     arrayOfMixed(convertRawProp(context, rawProps, \\"arrayOfMixed\\", sourceProps.arrayOfMixed, {})) {}
     
 #ifdef RN_SERIALIZABLE_STATE
-ComponentName ArrayPropsNativeComponentViewProps::getDiffPropsImplementationTarget() const {
-  return \\"ArrayPropsNativeComponentView\\";
-}
-
 folly::dynamic ArrayPropsNativeComponentViewProps::getDiffProps(
     const Props* prevProps) const {
   static const auto defaultProps = ArrayPropsNativeComponentViewProps();
@@ -55,57 +51,18 @@ folly::dynamic ArrayPropsNativeComponentViewProps::getDiffProps(
   }
   folly::dynamic result = HostPlatformViewProps::getDiffProps(prevProps);
   
-  if (names != oldProps->names) {
-    result[\\"names\\"] = toDynamic(names);
-  }
     
-  if (disableds != oldProps->disableds) {
-    result[\\"disableds\\"] = toDynamic(disableds);
-  }
     
-  if (progress != oldProps->progress) {
-    result[\\"progress\\"] = toDynamic(progress);
-  }
     
-  if (radii != oldProps->radii) {
-    result[\\"radii\\"] = toDynamic(radii);
-  }
     
-  if (colors != oldProps->colors) {
-    result[\\"colors\\"] = toDynamic(colors);
-  }
     
-  if (srcs != oldProps->srcs) {
-    result[\\"srcs\\"] = toDynamic(srcs);
-  }
     
-  if (points != oldProps->points) {
-    result[\\"points\\"] = toDynamic(points);
-  }
     
-  if (edgeInsets != oldProps->edgeInsets) {
-    result[\\"edgeInsets\\"] = toDynamic(edgeInsets);
-  }
     
-  if (dimensions != oldProps->dimensions) {
-    result[\\"dimensions\\"] = toDynamic(dimensions);
-  }
     
-  if (sizes != oldProps->sizes) {
-    result[\\"sizes\\"] = toDynamic(sizes);
-  }
     
-  if (object != oldProps->object) {
-    result[\\"object\\"] = toDynamic(object);
-  }
     
-  if (arrayOfObjects != oldProps->arrayOfObjects) {
-    result[\\"arrayOfObjects\\"] = toDynamic(arrayOfObjects);
-  }
     
-  if (arrayOfMixed != oldProps->arrayOfMixed) {
-    result[\\"arrayOfMixed\\"] = toDynamic(arrayOfMixed);
-  }
   return result;
 }
 #endif
@@ -142,10 +99,6 @@ BooleanPropNativeComponentViewProps::BooleanPropNativeComponentViewProps(
     disabledNullable(convertRawProp(context, rawProps, \\"disabledNullable\\", sourceProps.disabledNullable, {})) {}
     
 #ifdef RN_SERIALIZABLE_STATE
-ComponentName BooleanPropNativeComponentViewProps::getDiffPropsImplementationTarget() const {
-  return \\"BooleanPropNativeComponentView\\";
-}
-
 folly::dynamic BooleanPropNativeComponentViewProps::getDiffProps(
     const Props* prevProps) const {
   static const auto defaultProps = BooleanPropNativeComponentViewProps();
@@ -199,10 +152,6 @@ ColorPropNativeComponentViewProps::ColorPropNativeComponentViewProps(
     tintColor(convertRawProp(context, rawProps, \\"tintColor\\", sourceProps.tintColor, {})) {}
     
 #ifdef RN_SERIALIZABLE_STATE
-ComponentName ColorPropNativeComponentViewProps::getDiffPropsImplementationTarget() const {
-  return \\"ColorPropNativeComponentView\\";
-}
-
 folly::dynamic ColorPropNativeComponentViewProps::getDiffProps(
     const Props* prevProps) const {
   static const auto defaultProps = ColorPropNativeComponentViewProps();
@@ -253,10 +202,6 @@ DimensionPropNativeComponentViewProps::DimensionPropNativeComponentViewProps(
     marginBack(convertRawProp(context, rawProps, \\"marginBack\\", sourceProps.marginBack, {})) {}
     
 #ifdef RN_SERIALIZABLE_STATE
-ComponentName DimensionPropNativeComponentViewProps::getDiffPropsImplementationTarget() const {
-  return \\"DimensionPropNativeComponentView\\";
-}
-
 folly::dynamic DimensionPropNativeComponentViewProps::getDiffProps(
     const Props* prevProps) const {
   static const auto defaultProps = DimensionPropNativeComponentViewProps();
@@ -268,9 +213,6 @@ folly::dynamic DimensionPropNativeComponentViewProps::getDiffProps(
   }
   folly::dynamic result = HostPlatformViewProps::getDiffProps(prevProps);
   
-  if (marginBack != oldProps->marginBack) {
-    result[\\"marginBack\\"] = toDynamic(marginBack);
-  }
   return result;
 }
 #endif
@@ -306,10 +248,6 @@ EdgeInsetsPropNativeComponentViewProps::EdgeInsetsPropNativeComponentViewProps(
      {}
     
 #ifdef RN_SERIALIZABLE_STATE
-ComponentName EdgeInsetsPropNativeComponentViewProps::getDiffPropsImplementationTarget() const {
-  return \\"EdgeInsetsPropNativeComponentView\\";
-}
-
 folly::dynamic EdgeInsetsPropNativeComponentViewProps::getDiffProps(
     const Props* prevProps) const {
   static const auto defaultProps = EdgeInsetsPropNativeComponentViewProps();
@@ -357,10 +295,6 @@ EnumPropNativeComponentViewProps::EnumPropNativeComponentViewProps(
     intervals(convertRawProp(context, rawProps, \\"intervals\\", sourceProps.intervals, {EnumPropNativeComponentViewIntervals::Intervals0})) {}
     
 #ifdef RN_SERIALIZABLE_STATE
-ComponentName EnumPropNativeComponentViewProps::getDiffPropsImplementationTarget() const {
-  return \\"EnumPropNativeComponentView\\";
-}
-
 folly::dynamic EnumPropNativeComponentViewProps::getDiffProps(
     const Props* prevProps) const {
   static const auto defaultProps = EnumPropNativeComponentViewProps();
@@ -372,13 +306,7 @@ folly::dynamic EnumPropNativeComponentViewProps::getDiffProps(
   }
   folly::dynamic result = HostPlatformViewProps::getDiffProps(prevProps);
   
-  if (alignment != oldProps->alignment) {
-    result[\\"alignment\\"] = toDynamic(alignment);
-  }
     
-  if (intervals != oldProps->intervals) {
-    result[\\"intervals\\"] = toDynamic(intervals);
-  }
   return result;
 }
 #endif
@@ -414,10 +342,6 @@ EventNestedObjectPropsNativeComponentViewProps::EventNestedObjectPropsNativeComp
     disabled(convertRawProp(context, rawProps, \\"disabled\\", sourceProps.disabled, {false})) {}
     
 #ifdef RN_SERIALIZABLE_STATE
-ComponentName EventNestedObjectPropsNativeComponentViewProps::getDiffPropsImplementationTarget() const {
-  return \\"EventNestedObjectPropsNativeComponentView\\";
-}
-
 folly::dynamic EventNestedObjectPropsNativeComponentViewProps::getDiffProps(
     const Props* prevProps) const {
   static const auto defaultProps = EventNestedObjectPropsNativeComponentViewProps();
@@ -467,10 +391,6 @@ EventPropsNativeComponentViewProps::EventPropsNativeComponentViewProps(
     disabled(convertRawProp(context, rawProps, \\"disabled\\", sourceProps.disabled, {false})) {}
     
 #ifdef RN_SERIALIZABLE_STATE
-ComponentName EventPropsNativeComponentViewProps::getDiffPropsImplementationTarget() const {
-  return \\"EventPropsNativeComponentView\\";
-}
-
 folly::dynamic EventPropsNativeComponentViewProps::getDiffProps(
     const Props* prevProps) const {
   static const auto defaultProps = EventPropsNativeComponentViewProps();
@@ -526,10 +446,6 @@ FloatPropsNativeComponentViewProps::FloatPropsNativeComponentViewProps(
     blurRadiusNullable(convertRawProp(context, rawProps, \\"blurRadiusNullable\\", sourceProps.blurRadiusNullable, {})) {}
     
 #ifdef RN_SERIALIZABLE_STATE
-ComponentName FloatPropsNativeComponentViewProps::getDiffPropsImplementationTarget() const {
-  return \\"FloatPropsNativeComponentView\\";
-}
-
 folly::dynamic FloatPropsNativeComponentViewProps::getDiffProps(
     const Props* prevProps) const {
   static const auto defaultProps = FloatPropsNativeComponentViewProps();
@@ -604,10 +520,6 @@ ImagePropNativeComponentViewProps::ImagePropNativeComponentViewProps(
     thumbImage(convertRawProp(context, rawProps, \\"thumbImage\\", sourceProps.thumbImage, {})) {}
     
 #ifdef RN_SERIALIZABLE_STATE
-ComponentName ImagePropNativeComponentViewProps::getDiffPropsImplementationTarget() const {
-  return \\"ImagePropNativeComponentView\\";
-}
-
 folly::dynamic ImagePropNativeComponentViewProps::getDiffProps(
     const Props* prevProps) const {
   static const auto defaultProps = ImagePropNativeComponentViewProps();
@@ -620,7 +532,7 @@ folly::dynamic ImagePropNativeComponentViewProps::getDiffProps(
   folly::dynamic result = HostPlatformViewProps::getDiffProps(prevProps);
   
   if (thumbImage != oldProps->thumbImage) {
-    result[\\"thumbImage\\"] = toDynamic(thumbImage);
+    result[\\"thumbImage\\"] = thumbImage.toDynamic();
   }
   return result;
 }
@@ -659,10 +571,6 @@ IntegerPropNativeComponentViewProps::IntegerPropNativeComponentViewProps(
     progress3(convertRawProp(context, rawProps, \\"progress3\\", sourceProps.progress3, {10})) {}
     
 #ifdef RN_SERIALIZABLE_STATE
-ComponentName IntegerPropNativeComponentViewProps::getDiffPropsImplementationTarget() const {
-  return \\"IntegerPropNativeComponentView\\";
-}
-
 folly::dynamic IntegerPropNativeComponentViewProps::getDiffProps(
     const Props* prevProps) const {
   static const auto defaultProps = IntegerPropNativeComponentViewProps();
@@ -720,10 +628,6 @@ InterfaceOnlyNativeComponentViewProps::InterfaceOnlyNativeComponentViewProps(
     title(convertRawProp(context, rawProps, \\"title\\", sourceProps.title, {\\"\\"})) {}
     
 #ifdef RN_SERIALIZABLE_STATE
-ComponentName InterfaceOnlyNativeComponentViewProps::getDiffPropsImplementationTarget() const {
-  return \\"InterfaceOnlyNativeComponentView\\";
-}
-
 folly::dynamic InterfaceOnlyNativeComponentViewProps::getDiffProps(
     const Props* prevProps) const {
   static const auto defaultProps = InterfaceOnlyNativeComponentViewProps();
@@ -774,10 +678,6 @@ MixedPropNativeComponentViewProps::MixedPropNativeComponentViewProps(
     mixedProp(convertRawProp(context, rawProps, \\"mixedProp\\", sourceProps.mixedProp, {})) {}
     
 #ifdef RN_SERIALIZABLE_STATE
-ComponentName MixedPropNativeComponentViewProps::getDiffPropsImplementationTarget() const {
-  return \\"MixedPropNativeComponentView\\";
-}
-
 folly::dynamic MixedPropNativeComponentViewProps::getDiffProps(
     const Props* prevProps) const {
   static const auto defaultProps = MixedPropNativeComponentViewProps();
@@ -789,9 +689,6 @@ folly::dynamic MixedPropNativeComponentViewProps::getDiffProps(
   }
   folly::dynamic result = HostPlatformViewProps::getDiffProps(prevProps);
   
-  if (mixedProp != oldProps->mixedProp) {
-    result[\\"mixedProp\\"] = mixedProp;
-  }
   return result;
 }
 #endif
@@ -831,10 +728,6 @@ MultiNativePropNativeComponentViewProps::MultiNativePropNativeComponentViewProps
     point(convertRawProp(context, rawProps, \\"point\\", sourceProps.point, {})) {}
     
 #ifdef RN_SERIALIZABLE_STATE
-ComponentName MultiNativePropNativeComponentViewProps::getDiffPropsImplementationTarget() const {
-  return \\"MultiNativePropNativeComponentView\\";
-}
-
 folly::dynamic MultiNativePropNativeComponentViewProps::getDiffProps(
     const Props* prevProps) const {
   static const auto defaultProps = MultiNativePropNativeComponentViewProps();
@@ -847,7 +740,7 @@ folly::dynamic MultiNativePropNativeComponentViewProps::getDiffProps(
   folly::dynamic result = HostPlatformViewProps::getDiffProps(prevProps);
   
   if (thumbImage != oldProps->thumbImage) {
-    result[\\"thumbImage\\"] = toDynamic(thumbImage);
+    result[\\"thumbImage\\"] = thumbImage.toDynamic();
   }
     
   if (color != oldProps->color) {
@@ -859,7 +752,10 @@ folly::dynamic MultiNativePropNativeComponentViewProps::getDiffProps(
   }
     
   if (point != oldProps->point) {
-    result[\\"point\\"] = toDynamic(point);
+    folly::dynamic pointResult = folly::dynamic::object();
+    pointResult[\\"x\\"] = point.x;
+    pointResult[\\"y\\"] = point.y;
+    result[\\"point\\"] = pointResult;
   }
   return result;
 }
@@ -896,10 +792,6 @@ NoPropsNoEventsNativeComponentViewProps::NoPropsNoEventsNativeComponentViewProps
      {}
     
 #ifdef RN_SERIALIZABLE_STATE
-ComponentName NoPropsNoEventsNativeComponentViewProps::getDiffPropsImplementationTarget() const {
-  return \\"NoPropsNoEventsNativeComponentView\\";
-}
-
 folly::dynamic NoPropsNoEventsNativeComponentViewProps::getDiffProps(
     const Props* prevProps) const {
   static const auto defaultProps = NoPropsNoEventsNativeComponentViewProps();
@@ -949,10 +841,6 @@ ObjectPropsNativeComponentProps::ObjectPropsNativeComponentProps(
     objectPrimitiveRequiredProp(convertRawProp(context, rawProps, \\"objectPrimitiveRequiredProp\\", sourceProps.objectPrimitiveRequiredProp, {})) {}
     
 #ifdef RN_SERIALIZABLE_STATE
-ComponentName ObjectPropsNativeComponentProps::getDiffPropsImplementationTarget() const {
-  return \\"ObjectPropsNativeComponent\\";
-}
-
 folly::dynamic ObjectPropsNativeComponentProps::getDiffProps(
     const Props* prevProps) const {
   static const auto defaultProps = ObjectPropsNativeComponentProps();
@@ -964,17 +852,8 @@ folly::dynamic ObjectPropsNativeComponentProps::getDiffProps(
   }
   folly::dynamic result = HostPlatformViewProps::getDiffProps(prevProps);
   
-  if (objectProp != oldProps->objectProp) {
-    result[\\"objectProp\\"] = toDynamic(objectProp);
-  }
     
-  if (objectArrayProp != oldProps->objectArrayProp) {
-    result[\\"objectArrayProp\\"] = toDynamic(objectArrayProp);
-  }
     
-  if (objectPrimitiveRequiredProp != oldProps->objectPrimitiveRequiredProp) {
-    result[\\"objectPrimitiveRequiredProp\\"] = toDynamic(objectPrimitiveRequiredProp);
-  }
   return result;
 }
 #endif
@@ -1010,10 +889,6 @@ PointPropNativeComponentViewProps::PointPropNativeComponentViewProps(
     startPoint(convertRawProp(context, rawProps, \\"startPoint\\", sourceProps.startPoint, {})) {}
     
 #ifdef RN_SERIALIZABLE_STATE
-ComponentName PointPropNativeComponentViewProps::getDiffPropsImplementationTarget() const {
-  return \\"PointPropNativeComponentView\\";
-}
-
 folly::dynamic PointPropNativeComponentViewProps::getDiffProps(
     const Props* prevProps) const {
   static const auto defaultProps = PointPropNativeComponentViewProps();
@@ -1026,7 +901,10 @@ folly::dynamic PointPropNativeComponentViewProps::getDiffProps(
   folly::dynamic result = HostPlatformViewProps::getDiffProps(prevProps);
   
   if (startPoint != oldProps->startPoint) {
-    result[\\"startPoint\\"] = toDynamic(startPoint);
+    folly::dynamic pointResult = folly::dynamic::object();
+    pointResult[\\"x\\"] = startPoint.x;
+    pointResult[\\"y\\"] = startPoint.y;
+    result[\\"startPoint\\"] = pointResult;
   }
   return result;
 }
@@ -1064,10 +942,6 @@ StringPropNativeComponentViewProps::StringPropNativeComponentViewProps(
     defaultValue(convertRawProp(context, rawProps, \\"defaultValue\\", sourceProps.defaultValue, {})) {}
     
 #ifdef RN_SERIALIZABLE_STATE
-ComponentName StringPropNativeComponentViewProps::getDiffPropsImplementationTarget() const {
-  return \\"StringPropNativeComponentView\\";
-}
-
 folly::dynamic StringPropNativeComponentViewProps::getDiffProps(
     const Props* prevProps) const {
   static const auto defaultProps = StringPropNativeComponentViewProps();

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

@@ -16,7 +16,6 @@ Object {
 #include <cinttypes>
 #include <react/renderer/components/view/ViewProps.h>
 #include <react/renderer/core/PropsParserContext.h>
-#include <react/renderer/core/graphicsConversions.h>
 #include <react/renderer/core/propsConversions.h>
 #include <react/renderer/graphics/Color.h>
 #include <react/renderer/graphics/Point.h>
@@ -88,16 +87,6 @@ static inline std::string toString(const ArrayPropsNativeComponentViewSizesMaskW
 }
 struct ArrayPropsNativeComponentViewObjectStruct {
   std::string prop{};
-
-#ifdef RN_SERIALIZABLE_STATE
-  bool operator==(const ArrayPropsNativeComponentViewObjectStruct&) const = default;
-
-  folly::dynamic toDynamic() const {
-    folly::dynamic result = folly::dynamic::object();
-    result[\\"prop\\"] = prop;
-    return result;
-  }
-#endif
 };
 
 static inline void fromRawValue(const PropsParserContext& context, const RawValue &value, ArrayPropsNativeComponentViewObjectStruct &result) {
@@ -113,12 +102,6 @@ static inline std::string toString(const ArrayPropsNativeComponentViewObjectStru
   return \\"[Object ArrayPropsNativeComponentViewObjectStruct]\\";
 }
 
-#ifdef RN_SERIALIZABLE_STATE
-static inline folly::dynamic toDynamic(const ArrayPropsNativeComponentViewObjectStruct &value) {
-  return value.toDynamic();
-}
-#endif
-
 static inline void fromRawValue(const PropsParserContext& context, const RawValue &value, std::vector<ArrayPropsNativeComponentViewObjectStruct> &result) {
   auto items = (std::vector<RawValue>)value;
   for (const auto &item : items) {
@@ -132,17 +115,6 @@ static inline void fromRawValue(const PropsParserContext& context, const RawValu
 struct ArrayPropsNativeComponentViewArrayOfObjectsStruct {
   Float prop1{0.0};
   int prop2{0};
-
-#ifdef RN_SERIALIZABLE_STATE
-  bool operator==(const ArrayPropsNativeComponentViewArrayOfObjectsStruct&) const = default;
-
-  folly::dynamic toDynamic() const {
-    folly::dynamic result = folly::dynamic::object();
-    result[\\"prop1\\"] = prop1;
-    result[\\"prop2\\"] = prop2;
-    return result;
-  }
-#endif
 };
 
 static inline void fromRawValue(const PropsParserContext& context, const RawValue &value, ArrayPropsNativeComponentViewArrayOfObjectsStruct &result) {
@@ -162,12 +134,6 @@ static inline std::string toString(const ArrayPropsNativeComponentViewArrayOfObj
   return \\"[Object ArrayPropsNativeComponentViewArrayOfObjectsStruct]\\";
 }
 
-#ifdef RN_SERIALIZABLE_STATE
-static inline folly::dynamic toDynamic(const ArrayPropsNativeComponentViewArrayOfObjectsStruct &value) {
-  return value.toDynamic();
-}
-#endif
-
 static inline void fromRawValue(const PropsParserContext& context, const RawValue &value, std::vector<ArrayPropsNativeComponentViewArrayOfObjectsStruct> &result) {
   auto items = (std::vector<RawValue>)value;
   for (const auto &item : items) {
@@ -199,8 +165,6 @@ class ArrayPropsNativeComponentViewProps final : public ViewProps {
   std::vector<folly::dynamic> arrayOfMixed{};
 
   #ifdef RN_SERIALIZABLE_STATE
-  ComponentName getDiffPropsImplementationTarget() const override;
-
   folly::dynamic getDiffProps(const Props* prevProps) const override;
   #endif
 };
@@ -239,8 +203,6 @@ class BooleanPropNativeComponentViewProps final : public ViewProps {
   bool disabledNullable{};
 
   #ifdef RN_SERIALIZABLE_STATE
-  ComponentName getDiffPropsImplementationTarget() const override;
-
   folly::dynamic getDiffProps(const Props* prevProps) const override;
   #endif
 };
@@ -279,8 +241,6 @@ class ColorPropNativeComponentViewProps final : public ViewProps {
   SharedColor tintColor{};
 
   #ifdef RN_SERIALIZABLE_STATE
-  ComponentName getDiffPropsImplementationTarget() const override;
-
   folly::dynamic getDiffProps(const Props* prevProps) const override;
   #endif
 };
@@ -305,7 +265,6 @@ Object {
 
 #include <react/renderer/components/view/ViewProps.h>
 #include <react/renderer/core/PropsParserContext.h>
-#include <react/renderer/core/graphicsConversions.h>
 #include <yoga/Yoga.h>
 
 namespace facebook::react {
@@ -320,8 +279,6 @@ class DimensionPropNativeComponentViewProps final : public ViewProps {
   YGValue marginBack{};
 
   #ifdef RN_SERIALIZABLE_STATE
-  ComponentName getDiffPropsImplementationTarget() const override;
-
   folly::dynamic getDiffProps(const Props* prevProps) const override;
   #endif
 };
@@ -359,8 +316,6 @@ class EdgeInsetsPropNativeComponentViewProps final : public ViewProps {
   
 
   #ifdef RN_SERIALIZABLE_STATE
-  ComponentName getDiffPropsImplementationTarget() const override;
-
   folly::dynamic getDiffProps(const Props* prevProps) const override;
   #endif
 };
@@ -405,12 +360,6 @@ static inline std::string toString(const EnumPropNativeComponentViewAlignment &v
     case EnumPropNativeComponentViewAlignment::BottomRight: return \\"bottom-right\\";
   }
 }
-
-#ifdef RN_SERIALIZABLE_STATE
-static inline folly::dynamic toDynamic(const EnumPropNativeComponentViewAlignment &value) {
-  return toString(value);
-}
-#endif
 enum class EnumPropNativeComponentViewIntervals { Intervals0 = 0, Intervals15 = 15, Intervals30 = 30, Intervals60 = 60 };
 
 static inline void fromRawValue(const PropsParserContext& context, const RawValue &value, EnumPropNativeComponentViewIntervals &result) {
@@ -442,17 +391,6 @@ static inline std::string toString(const EnumPropNativeComponentViewIntervals &v
   }
 }
 
-#ifdef RN_SERIALIZABLE_STATE
-static inline folly::dynamic toDynamic(const EnumPropNativeComponentViewIntervals &value) {
-  switch (value) {
-    case EnumPropNativeComponentViewIntervals::Intervals0: return 0;
-    case EnumPropNativeComponentViewIntervals::Intervals15: return 15;
-    case EnumPropNativeComponentViewIntervals::Intervals30: return 30;
-    case EnumPropNativeComponentViewIntervals::Intervals60: return 60;
-  }
-}
-#endif
-
 class EnumPropNativeComponentViewProps final : public ViewProps {
  public:
   EnumPropNativeComponentViewProps() = default;
@@ -464,8 +402,6 @@ class EnumPropNativeComponentViewProps final : public ViewProps {
   EnumPropNativeComponentViewIntervals intervals{EnumPropNativeComponentViewIntervals::Intervals0};
 
   #ifdef RN_SERIALIZABLE_STATE
-  ComponentName getDiffPropsImplementationTarget() const override;
-
   folly::dynamic getDiffProps(const Props* prevProps) const override;
   #endif
 };
@@ -503,8 +439,6 @@ class EventNestedObjectPropsNativeComponentViewProps final : public ViewProps {
   bool disabled{false};
 
   #ifdef RN_SERIALIZABLE_STATE
-  ComponentName getDiffPropsImplementationTarget() const override;
-
   folly::dynamic getDiffProps(const Props* prevProps) const override;
   #endif
 };
@@ -542,8 +476,6 @@ class EventPropsNativeComponentViewProps final : public ViewProps {
   bool disabled{false};
 
   #ifdef RN_SERIALIZABLE_STATE
-  ComponentName getDiffPropsImplementationTarget() const override;
-
   folly::dynamic getDiffProps(const Props* prevProps) const override;
   #endif
 };
@@ -587,8 +519,6 @@ class FloatPropsNativeComponentViewProps final : public ViewProps {
   Float blurRadiusNullable{};
 
   #ifdef RN_SERIALIZABLE_STATE
-  ComponentName getDiffPropsImplementationTarget() const override;
-
   folly::dynamic getDiffProps(const Props* prevProps) const override;
   #endif
 };
@@ -627,8 +557,6 @@ class ImagePropNativeComponentViewProps final : public ViewProps {
   ImageSource thumbImage{};
 
   #ifdef RN_SERIALIZABLE_STATE
-  ComponentName getDiffPropsImplementationTarget() const override;
-
   folly::dynamic getDiffProps(const Props* prevProps) const override;
   #endif
 };
@@ -668,8 +596,6 @@ class IntegerPropNativeComponentViewProps final : public ViewProps {
   int progress3{10};
 
   #ifdef RN_SERIALIZABLE_STATE
-  ComponentName getDiffPropsImplementationTarget() const override;
-
   folly::dynamic getDiffProps(const Props* prevProps) const override;
   #endif
 };
@@ -707,8 +633,6 @@ class InterfaceOnlyNativeComponentViewProps final : public ViewProps {
   std::string title{\\"\\"};
 
   #ifdef RN_SERIALIZABLE_STATE
-  ComponentName getDiffPropsImplementationTarget() const override;
-
   folly::dynamic getDiffProps(const Props* prevProps) const override;
   #endif
 };
@@ -746,8 +670,6 @@ class MixedPropNativeComponentViewProps final : public ViewProps {
   folly::dynamic mixedProp{};
 
   #ifdef RN_SERIALIZABLE_STATE
-  ComponentName getDiffPropsImplementationTarget() const override;
-
   folly::dynamic getDiffProps(const Props* prevProps) const override;
   #endif
 };
@@ -791,8 +713,6 @@ class MultiNativePropNativeComponentViewProps final : public ViewProps {
   Point point{};
 
   #ifdef RN_SERIALIZABLE_STATE
-  ComponentName getDiffPropsImplementationTarget() const override;
-
   folly::dynamic getDiffProps(const Props* prevProps) const override;
   #endif
 };
@@ -830,8 +750,6 @@ class NoPropsNoEventsNativeComponentViewProps final : public ViewProps {
   
 
   #ifdef RN_SERIALIZABLE_STATE
-  ComponentName getDiffPropsImplementationTarget() const override;
-
   folly::dynamic getDiffProps(const Props* prevProps) const override;
   #endif
 };
@@ -880,12 +798,6 @@ static inline std::string toString(const ObjectPropsNativeComponentStringEnumPro
     case ObjectPropsNativeComponentStringEnumProp::Large: return \\"large\\";
   }
 }
-
-#ifdef RN_SERIALIZABLE_STATE
-static inline folly::dynamic toDynamic(const ObjectPropsNativeComponentStringEnumProp &value) {
-  return toString(value);
-}
-#endif
 enum class ObjectPropsNativeComponentIntEnumProp { IntEnumProp0 = 0, IntEnumProp1 = 1 };
 
 static inline void fromRawValue(const PropsParserContext& context, const RawValue &value, ObjectPropsNativeComponentIntEnumProp &result) {
@@ -908,15 +820,6 @@ static inline std::string toString(const ObjectPropsNativeComponentIntEnumProp &
     case ObjectPropsNativeComponentIntEnumProp::IntEnumProp1: return \\"1\\";
   }
 }
-
-#ifdef RN_SERIALIZABLE_STATE
-static inline folly::dynamic toDynamic(const ObjectPropsNativeComponentIntEnumProp &value) {
-  switch (value) {
-    case ObjectPropsNativeComponentIntEnumProp::IntEnumProp0: return 0;
-    case ObjectPropsNativeComponentIntEnumProp::IntEnumProp1: return 1;
-  }
-}
-#endif
 struct ObjectPropsNativeComponentObjectPropStruct {
   std::string stringProp{\\"\\"};
   bool booleanProp{false};
@@ -924,21 +827,6 @@ struct ObjectPropsNativeComponentObjectPropStruct {
   int intProp{0};
   ObjectPropsNativeComponentStringEnumProp stringEnumProp{ObjectPropsNativeComponentStringEnumProp::Small};
   ObjectPropsNativeComponentIntEnumProp intEnumProp{ObjectPropsNativeComponentIntEnumProp::IntEnumProp0};
-
-#ifdef RN_SERIALIZABLE_STATE
-  bool operator==(const ObjectPropsNativeComponentObjectPropStruct&) const = default;
-
-  folly::dynamic toDynamic() const {
-    folly::dynamic result = folly::dynamic::object();
-    result[\\"stringProp\\"] = stringProp;
-    result[\\"booleanProp\\"] = booleanProp;
-    result[\\"floatProp\\"] = floatProp;
-    result[\\"intProp\\"] = intProp;
-    result[\\"stringEnumProp\\"] = ::facebook::react::toDynamic(stringEnumProp);
-    result[\\"intEnumProp\\"] = ::facebook::react::toDynamic(intEnumProp);
-    return result;
-  }
-#endif
 };
 
 static inline void fromRawValue(const PropsParserContext& context, const RawValue &value, ObjectPropsNativeComponentObjectPropStruct &result) {
@@ -974,24 +862,8 @@ static inline std::string toString(const ObjectPropsNativeComponentObjectPropStr
   return \\"[Object ObjectPropsNativeComponentObjectPropStruct]\\";
 }
 
-#ifdef RN_SERIALIZABLE_STATE
-static inline folly::dynamic toDynamic(const ObjectPropsNativeComponentObjectPropStruct &value) {
-  return value.toDynamic();
-}
-#endif
-
 struct ObjectPropsNativeComponentObjectArrayPropStruct {
   std::vector<std::string> array{};
-
-#ifdef RN_SERIALIZABLE_STATE
-  bool operator==(const ObjectPropsNativeComponentObjectArrayPropStruct&) const = default;
-
-  folly::dynamic toDynamic() const {
-    folly::dynamic result = folly::dynamic::object();
-    result[\\"array\\"] = ::facebook::react::toDynamic(array);
-    return result;
-  }
-#endif
 };
 
 static inline void fromRawValue(const PropsParserContext& context, const RawValue &value, ObjectPropsNativeComponentObjectArrayPropStruct &result) {
@@ -1007,28 +879,10 @@ static inline std::string toString(const ObjectPropsNativeComponentObjectArrayPr
   return \\"[Object ObjectPropsNativeComponentObjectArrayPropStruct]\\";
 }
 
-#ifdef RN_SERIALIZABLE_STATE
-static inline folly::dynamic toDynamic(const ObjectPropsNativeComponentObjectArrayPropStruct &value) {
-  return value.toDynamic();
-}
-#endif
-
 struct ObjectPropsNativeComponentObjectPrimitiveRequiredPropStruct {
   ImageSource image{};
   SharedColor color{};
   Point point{};
-
-#ifdef RN_SERIALIZABLE_STATE
-  bool operator==(const ObjectPropsNativeComponentObjectPrimitiveRequiredPropStruct&) const = default;
-
-  folly::dynamic toDynamic() const {
-    folly::dynamic result = folly::dynamic::object();
-    result[\\"image\\"] = ::facebook::react::toDynamic(image);
-    result[\\"color\\"] = ::facebook::react::toDynamic(color);
-    result[\\"point\\"] = ::facebook::react::toDynamic(point);
-    return result;
-  }
-#endif
 };
 
 static inline void fromRawValue(const PropsParserContext& context, const RawValue &value, ObjectPropsNativeComponentObjectPrimitiveRequiredPropStruct &result) {
@@ -1051,12 +905,6 @@ static inline void fromRawValue(const PropsParserContext& context, const RawValu
 static inline std::string toString(const ObjectPropsNativeComponentObjectPrimitiveRequiredPropStruct &value) {
   return \\"[Object ObjectPropsNativeComponentObjectPrimitiveRequiredPropStruct]\\";
 }
-
-#ifdef RN_SERIALIZABLE_STATE
-static inline folly::dynamic toDynamic(const ObjectPropsNativeComponentObjectPrimitiveRequiredPropStruct &value) {
-  return value.toDynamic();
-}
-#endif
 class ObjectPropsNativeComponentProps final : public ViewProps {
  public:
   ObjectPropsNativeComponentProps() = default;
@@ -1069,8 +917,6 @@ class ObjectPropsNativeComponentProps final : public ViewProps {
   ObjectPropsNativeComponentObjectPrimitiveRequiredPropStruct objectPrimitiveRequiredProp{};
 
   #ifdef RN_SERIALIZABLE_STATE
-  ComponentName getDiffPropsImplementationTarget() const override;
-
   folly::dynamic getDiffProps(const Props* prevProps) const override;
   #endif
 };
@@ -1109,8 +955,6 @@ class PointPropNativeComponentViewProps final : public ViewProps {
   Point startPoint{};
 
   #ifdef RN_SERIALIZABLE_STATE
-  ComponentName getDiffPropsImplementationTarget() const override;
-
   folly::dynamic getDiffProps(const Props* prevProps) const override;
   #endif
 };
@@ -1149,8 +993,6 @@ class StringPropNativeComponentViewProps final : public ViewProps {
   std::string defaultValue{};
 
   #ifdef RN_SERIALIZABLE_STATE
-  ComponentName getDiffPropsImplementationTarget() const override;
-
   folly::dynamic getDiffProps(const Props* prevProps) const override;
   #endif
 };

packages/react-native-codegen/package.json

@@ -30,7 +30,7 @@
   ],
   "dependencies": {
     "glob": "^7.1.1",
-    "hermes-parser": "0.29.0",
+    "hermes-parser": "0.28.1",
     "invariant": "^2.2.4",
     "nullthrows": "^1.1.1",
     "yargs": "^17.6.2"
@@ -43,7 +43,7 @@
     "@babel/plugin-transform-nullish-coalescing-operator": "^7.24.7",
     "@babel/plugin-transform-optional-chaining": "^7.24.8",
     "@babel/preset-env": "^7.25.3",
-    "hermes-estree": "0.29.0",
+    "hermes-estree": "0.28.1",
     "micromatch": "^4.0.4",
     "prettier": "2.8.8",
     "rimraf": "^3.0.2"

packages/react-native-codegen/src/generators/RNCodegen.js

@@ -73,9 +73,9 @@ const ALL_GENERATORS = {
   generateViewConfigJs: generateViewConfigJs.generate,
 };
 
-export type FilesOutput = Map<string, string>;
+type FilesOutput = Map<string, string>;
 
-export type GenerateFunction = (
+type GenerateFunction = (
   libraryName: string,
   schema: SchemaType,
   packageName?: string,
@@ -83,11 +83,11 @@ export type GenerateFunction = (
   headerPrefix?: string,
 ) => FilesOutput;
 
-export type LibraryGeneratorsFunctions = $ReadOnly<{
+type LibraryGeneratorsFunctions = $ReadOnly<{
   [string]: Array<GenerateFunction>,
 }>;
 
-export type LibraryOptions = $ReadOnly<{
+type LibraryOptions = $ReadOnly<{
   libraryName: string,
   schema: SchemaType,
   outputDirectory: string,
@@ -97,13 +97,13 @@ export type LibraryOptions = $ReadOnly<{
   libraryGenerators?: LibraryGeneratorsFunctions,
 }>;
 
-export type SchemasOptions = $ReadOnly<{
+type SchemasOptions = $ReadOnly<{
   schemas: {[string]: SchemaType},
   outputDirectory: string,
   supportedApplePlatforms?: {[string]: {[string]: boolean}},
 }>;
 
-export type LibraryGenerators =
+type LibraryGenerators =
   | 'componentsAndroid'
   | 'componentsIOS'
   | 'descriptors'
@@ -116,14 +116,14 @@ export type LibraryGenerators =
   | 'modulesCxx'
   | 'modulesIOS';
 
-export type SchemasGenerators = 'providerIOS';
+type SchemasGenerators = 'providerIOS';
 
-export type LibraryConfig = $ReadOnly<{
+type LibraryConfig = $ReadOnly<{
   generators: Array<LibraryGenerators>,
   test?: boolean,
 }>;
 
-export type SchemasConfig = $ReadOnly<{
+type SchemasConfig = $ReadOnly<{
   generators: Array<SchemasGenerators>,
   test?: boolean,
 }>;

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

@@ -245,7 +245,6 @@ function getLocalImports(
         return;
       case 'DimensionPrimitive':
         imports.add('#include <yoga/Yoga.h>');
-        imports.add('#include <react/renderer/core/graphicsConversions.h>');
         return;
       default:
         (name: empty);

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

@@ -105,7 +105,7 @@ function generatePropsDiffString(
             case 'ImageSourcePrimitive':
               return `
   if (${prop.name} != oldProps->${prop.name}) {
-    result["${prop.name}"] = toDynamic(${prop.name});
+    result["${prop.name}"] = ${prop.name}.toDynamic();
   }`;
             case 'ImageRequestPrimitive':
               // Shouldn't be used in props
@@ -115,47 +115,24 @@ function generatePropsDiffString(
             case 'PointPrimitive':
               return `
   if (${prop.name} != oldProps->${prop.name}) {
-    result["${prop.name}"] = toDynamic(${prop.name});
+    folly::dynamic pointResult = folly::dynamic::object();
+    pointResult["x"] = ${prop.name}.x;
+    pointResult["y"] = ${prop.name}.y;
+    result["${prop.name}"] = pointResult;
   }`;
             case 'EdgeInsetsPrimitive':
-              return `
-  if (${prop.name} != oldProps->${prop.name}) {
-    result["${prop.name}"] = toDynamic(${prop.name});
-  }`;
             case 'DimensionPrimitive':
-              return `
-  if (${prop.name} != oldProps->${prop.name}) {
-    result["${prop.name}"] = toDynamic(${prop.name});
-  }`;
+              // TODO: Implement diffProps for complex types
+              return '';
             default:
               (typeAnnotation.name: empty);
               throw new Error('Received unknown ReservedPropTypeAnnotation');
           }
         case 'ArrayTypeAnnotation':
-          return `
-  if (${prop.name} != oldProps->${prop.name}) {
-    result["${prop.name}"] = toDynamic(${prop.name});
-  }`;
         case 'ObjectTypeAnnotation':
-          return `
-  if (${prop.name} != oldProps->${prop.name}) {
-    result["${prop.name}"] = toDynamic(${prop.name});
-  }`;
         case 'StringEnumTypeAnnotation':
-          return `
-  if (${prop.name} != oldProps->${prop.name}) {
-    result["${prop.name}"] = toDynamic(${prop.name});
-  }`;
         case 'Int32EnumTypeAnnotation':
-          return `
-  if (${prop.name} != oldProps->${prop.name}) {
-    result["${prop.name}"] = toDynamic(${prop.name});
-  }`;
         case 'MixedTypeAnnotation':
-          return `
-  if (${prop.name} != oldProps->${prop.name}) {
-    result["${prop.name}"] = ${prop.name};
-  }`;
         default:
           // TODO: Implement diffProps for complex types
           return '';
@@ -165,10 +142,6 @@ function generatePropsDiffString(
 
   return `
 #ifdef RN_SERIALIZABLE_STATE
-ComponentName ${className}::getDiffPropsImplementationTarget() const {
-  return "${componentName}";
-}
-
 folly::dynamic ${className}::getDiffProps(
     const Props* prevProps) const {
   static const auto defaultProps = ${className}();

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

@@ -85,8 +85,6 @@ class ${className} final${extendClasses} {
   ${props}
 
   #ifdef RN_SERIALIZABLE_STATE
-  ComponentName getDiffPropsImplementationTarget() const override;
-
   folly::dynamic getDiffProps(const Props* prevProps) const override;
   #endif
 };
@@ -117,12 +115,6 @@ static inline std::string toString(const ${enumName} &value) {
     ${toCases}
   }
 }
-
-#ifdef RN_SERIALIZABLE_STATE
-static inline folly::dynamic toDynamic(const ${enumName} &value) {
-  return toString(value);
-}
-#endif
 `.trim();
 
 const IntEnumTemplate = ({
@@ -130,13 +122,11 @@ const IntEnumTemplate = ({
   values,
   fromCases,
   toCases,
-  toDynamicCases,
 }: {
   enumName: string,
   values: string,
   fromCases: string,
   toCases: string,
-  toDynamicCases: string,
 }) =>
   `
 enum class ${enumName} { ${values} };
@@ -154,39 +144,19 @@ static inline std::string toString(const ${enumName} &value) {
     ${toCases}
   }
 }
-
-#ifdef RN_SERIALIZABLE_STATE
-static inline folly::dynamic toDynamic(const ${enumName} &value) {
-  switch (value) {
-    ${toDynamicCases}
-  }
-}
-#endif
 `.trim();
 
 const StructTemplate = ({
   structName,
   fields,
   fromCases,
-  toDynamicCases,
 }: {
   structName: string,
   fields: string,
   fromCases: string,
-  toDynamicCases: string,
 }) =>
   `struct ${structName} {
   ${fields}
-
-#ifdef RN_SERIALIZABLE_STATE
-  bool operator==(const ${structName}&) const = default;
-
-  folly::dynamic toDynamic() const {
-    folly::dynamic result = folly::dynamic::object();
-    ${toDynamicCases}
-    return result;
-  }
-#endif
 };
 
 static inline void fromRawValue(const PropsParserContext& context, const RawValue &value, ${structName} &result) {
@@ -198,12 +168,6 @@ static inline void fromRawValue(const PropsParserContext& context, const RawValu
 static inline std::string toString(const ${structName} &value) {
   return "[Object ${structName}]";
 }
-
-#ifdef RN_SERIALIZABLE_STATE
-static inline folly::dynamic toDynamic(const ${structName} &value) {
-  return value.toDynamic();
-}
-#endif
 `.trim();
 
 const ArrayConversionFunctionTemplate = ({
@@ -437,16 +401,6 @@ function generateIntEnum(
       )
       .join('\n' + '    ');
 
-    const toDynamicCases = values
-      .map(
-        value =>
-          `case ${enumName}::${toIntEnumValueName(
-            prop.name,
-            value,
-          )}: return ${value};`,
-      )
-      .join('\n' + '    ');
-
     const valueVariables = values
       .map(val => `${toIntEnumValueName(prop.name, val)} = ${val}`)
       .join(', ');
@@ -456,7 +410,6 @@ function generateIntEnum(
       values: valueVariables,
       fromCases,
       toCases,
-      toDynamicCases,
     });
   }
 
@@ -748,30 +701,12 @@ function generateStruct(
     })
     .join('\n  ');
 
-  const toDynamicCases = properties
-    .map((property: NamedShape<PropTypeAnnotation>) => {
-      const name = property.name;
-      switch (property.typeAnnotation.type) {
-        case 'BooleanTypeAnnotation':
-        case 'StringTypeAnnotation':
-        case 'Int32TypeAnnotation':
-        case 'DoubleTypeAnnotation':
-        case 'FloatTypeAnnotation':
-        case 'MixedTypeAnnotation':
-          return `result["${name}"] = ${name};`;
-        default:
-          return `result["${name}"] = ::facebook::react::toDynamic(${name});`;
-      }
-    })
-    .join('\n    ');
-
   structs.set(
     structName,
     StructTemplate({
       structName,
       fields,
       fromCases,
-      toDynamicCases,
     }),
   );
 }

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

@@ -40,10 +40,6 @@ ArrayPropsNativeComponentProps::ArrayPropsNativeComponentProps(
     arrayOfMixed(convertRawProp(context, rawProps, \\"arrayOfMixed\\", sourceProps.arrayOfMixed, {})) {}
     
 #ifdef RN_SERIALIZABLE_STATE
-ComponentName ArrayPropsNativeComponentProps::getDiffPropsImplementationTarget() const {
-  return \\"ArrayPropsNativeComponent\\";
-}
-
 folly::dynamic ArrayPropsNativeComponentProps::getDiffProps(
     const Props* prevProps) const {
   static const auto defaultProps = ArrayPropsNativeComponentProps();
@@ -55,57 +51,18 @@ folly::dynamic ArrayPropsNativeComponentProps::getDiffProps(
   }
   folly::dynamic result = HostPlatformViewProps::getDiffProps(prevProps);
   
-  if (names != oldProps->names) {
-    result[\\"names\\"] = toDynamic(names);
-  }
     
-  if (disableds != oldProps->disableds) {
-    result[\\"disableds\\"] = toDynamic(disableds);
-  }
     
-  if (progress != oldProps->progress) {
-    result[\\"progress\\"] = toDynamic(progress);
-  }
     
-  if (radii != oldProps->radii) {
-    result[\\"radii\\"] = toDynamic(radii);
-  }
     
-  if (colors != oldProps->colors) {
-    result[\\"colors\\"] = toDynamic(colors);
-  }
     
-  if (srcs != oldProps->srcs) {
-    result[\\"srcs\\"] = toDynamic(srcs);
-  }
     
-  if (points != oldProps->points) {
-    result[\\"points\\"] = toDynamic(points);
-  }
     
-  if (dimensions != oldProps->dimensions) {
-    result[\\"dimensions\\"] = toDynamic(dimensions);
-  }
     
-  if (sizes != oldProps->sizes) {
-    result[\\"sizes\\"] = toDynamic(sizes);
-  }
     
-  if (object != oldProps->object) {
-    result[\\"object\\"] = toDynamic(object);
-  }
     
-  if (array != oldProps->array) {
-    result[\\"array\\"] = toDynamic(array);
-  }
     
-  if (arrayOfArrayOfObject != oldProps->arrayOfArrayOfObject) {
-    result[\\"arrayOfArrayOfObject\\"] = toDynamic(arrayOfArrayOfObject);
-  }
     
-  if (arrayOfMixed != oldProps->arrayOfMixed) {
-    result[\\"arrayOfMixed\\"] = toDynamic(arrayOfMixed);
-  }
   return result;
 }
 #endif
@@ -141,10 +98,6 @@ ArrayPropsNativeComponentProps::ArrayPropsNativeComponentProps(
     nativePrimitives(convertRawProp(context, rawProps, \\"nativePrimitives\\", sourceProps.nativePrimitives, {})) {}
     
 #ifdef RN_SERIALIZABLE_STATE
-ComponentName ArrayPropsNativeComponentProps::getDiffPropsImplementationTarget() const {
-  return \\"ArrayPropsNativeComponent\\";
-}
-
 folly::dynamic ArrayPropsNativeComponentProps::getDiffProps(
     const Props* prevProps) const {
   static const auto defaultProps = ArrayPropsNativeComponentProps();
@@ -156,9 +109,6 @@ folly::dynamic ArrayPropsNativeComponentProps::getDiffProps(
   }
   folly::dynamic result = HostPlatformViewProps::getDiffProps(prevProps);
   
-  if (nativePrimitives != oldProps->nativePrimitives) {
-    result[\\"nativePrimitives\\"] = toDynamic(nativePrimitives);
-  }
   return result;
 }
 #endif
@@ -194,10 +144,6 @@ BooleanPropNativeComponentProps::BooleanPropNativeComponentProps(
     disabled(convertRawProp(context, rawProps, \\"disabled\\", sourceProps.disabled, {false})) {}
     
 #ifdef RN_SERIALIZABLE_STATE
-ComponentName BooleanPropNativeComponentProps::getDiffPropsImplementationTarget() const {
-  return \\"BooleanPropNativeComponent\\";
-}
-
 folly::dynamic BooleanPropNativeComponentProps::getDiffProps(
     const Props* prevProps) const {
   static const auto defaultProps = BooleanPropNativeComponentProps();
@@ -247,10 +193,6 @@ ColorPropNativeComponentProps::ColorPropNativeComponentProps(
     tintColor(convertRawProp(context, rawProps, \\"tintColor\\", sourceProps.tintColor, {})) {}
     
 #ifdef RN_SERIALIZABLE_STATE
-ComponentName ColorPropNativeComponentProps::getDiffPropsImplementationTarget() const {
-  return \\"ColorPropNativeComponent\\";
-}
-
 folly::dynamic ColorPropNativeComponentProps::getDiffProps(
     const Props* prevProps) const {
   static const auto defaultProps = ColorPropNativeComponentProps();
@@ -300,10 +242,6 @@ CommandNativeComponentProps::CommandNativeComponentProps(
      {}
     
 #ifdef RN_SERIALIZABLE_STATE
-ComponentName CommandNativeComponentProps::getDiffPropsImplementationTarget() const {
-  return \\"CommandNativeComponent\\";
-}
-
 folly::dynamic CommandNativeComponentProps::getDiffProps(
     const Props* prevProps) const {
   static const auto defaultProps = CommandNativeComponentProps();
@@ -350,10 +288,6 @@ CommandNativeComponentProps::CommandNativeComponentProps(
     accessibilityHint(convertRawProp(context, rawProps, \\"accessibilityHint\\", sourceProps.accessibilityHint, {\\"\\"})) {}
     
 #ifdef RN_SERIALIZABLE_STATE
-ComponentName CommandNativeComponentProps::getDiffPropsImplementationTarget() const {
-  return \\"CommandNativeComponent\\";
-}
-
 folly::dynamic CommandNativeComponentProps::getDiffProps(
     const Props* prevProps) const {
   static const auto defaultProps = CommandNativeComponentProps();
@@ -404,10 +338,6 @@ DimensionPropNativeComponentProps::DimensionPropNativeComponentProps(
     marginBack(convertRawProp(context, rawProps, \\"marginBack\\", sourceProps.marginBack, {})) {}
     
 #ifdef RN_SERIALIZABLE_STATE
-ComponentName DimensionPropNativeComponentProps::getDiffPropsImplementationTarget() const {
-  return \\"DimensionPropNativeComponent\\";
-}
-
 folly::dynamic DimensionPropNativeComponentProps::getDiffProps(
     const Props* prevProps) const {
   static const auto defaultProps = DimensionPropNativeComponentProps();
@@ -419,9 +349,6 @@ folly::dynamic DimensionPropNativeComponentProps::getDiffProps(
   }
   folly::dynamic result = HostPlatformViewProps::getDiffProps(prevProps);
   
-  if (marginBack != oldProps->marginBack) {
-    result[\\"marginBack\\"] = toDynamic(marginBack);
-  }
   return result;
 }
 #endif
@@ -462,10 +389,6 @@ DoublePropNativeComponentProps::DoublePropNativeComponentProps(
     blurRadius6(convertRawProp(context, rawProps, \\"blurRadius6\\", sourceProps.blurRadius6, {0.0})) {}
     
 #ifdef RN_SERIALIZABLE_STATE
-ComponentName DoublePropNativeComponentProps::getDiffPropsImplementationTarget() const {
-  return \\"DoublePropNativeComponent\\";
-}
-
 folly::dynamic DoublePropNativeComponentProps::getDiffProps(
     const Props* prevProps) const {
   static const auto defaultProps = DoublePropNativeComponentProps();
@@ -535,10 +458,6 @@ EventsNestedObjectNativeComponentProps::EventsNestedObjectNativeComponentProps(
     disabled(convertRawProp(context, rawProps, \\"disabled\\", sourceProps.disabled, {false})) {}
     
 #ifdef RN_SERIALIZABLE_STATE
-ComponentName EventsNestedObjectNativeComponentProps::getDiffPropsImplementationTarget() const {
-  return \\"EventsNestedObjectNativeComponent\\";
-}
-
 folly::dynamic EventsNestedObjectNativeComponentProps::getDiffProps(
     const Props* prevProps) const {
   static const auto defaultProps = EventsNestedObjectNativeComponentProps();
@@ -588,10 +507,6 @@ EventsNativeComponentProps::EventsNativeComponentProps(
     disabled(convertRawProp(context, rawProps, \\"disabled\\", sourceProps.disabled, {false})) {}
     
 #ifdef RN_SERIALIZABLE_STATE
-ComponentName EventsNativeComponentProps::getDiffPropsImplementationTarget() const {
-  return \\"EventsNativeComponent\\";
-}
-
 folly::dynamic EventsNativeComponentProps::getDiffProps(
     const Props* prevProps) const {
   static const auto defaultProps = EventsNativeComponentProps();
@@ -641,10 +556,6 @@ InterfaceOnlyComponentProps::InterfaceOnlyComponentProps(
      {}
     
 #ifdef RN_SERIALIZABLE_STATE
-ComponentName InterfaceOnlyComponentProps::getDiffPropsImplementationTarget() const {
-  return \\"InterfaceOnlyComponent\\";
-}
-
 folly::dynamic InterfaceOnlyComponentProps::getDiffProps(
     const Props* prevProps) const {
   static const auto defaultProps = InterfaceOnlyComponentProps();
@@ -691,10 +602,6 @@ ExcludedAndroidComponentProps::ExcludedAndroidComponentProps(
      {}
     
 #ifdef RN_SERIALIZABLE_STATE
-ComponentName ExcludedAndroidComponentProps::getDiffPropsImplementationTarget() const {
-  return \\"ExcludedAndroidComponent\\";
-}
-
 folly::dynamic ExcludedAndroidComponentProps::getDiffProps(
     const Props* prevProps) const {
   static const auto defaultProps = ExcludedAndroidComponentProps();
@@ -741,10 +648,6 @@ ExcludedAndroidIosComponentProps::ExcludedAndroidIosComponentProps(
      {}
     
 #ifdef RN_SERIALIZABLE_STATE
-ComponentName ExcludedAndroidIosComponentProps::getDiffPropsImplementationTarget() const {
-  return \\"ExcludedAndroidIosComponent\\";
-}
-
 folly::dynamic ExcludedAndroidIosComponentProps::getDiffProps(
     const Props* prevProps) const {
   static const auto defaultProps = ExcludedAndroidIosComponentProps();
@@ -791,10 +694,6 @@ ExcludedIosComponentProps::ExcludedIosComponentProps(
      {}
     
 #ifdef RN_SERIALIZABLE_STATE
-ComponentName ExcludedIosComponentProps::getDiffPropsImplementationTarget() const {
-  return \\"ExcludedIosComponent\\";
-}
-
 folly::dynamic ExcludedIosComponentProps::getDiffProps(
     const Props* prevProps) const {
   static const auto defaultProps = ExcludedIosComponentProps();
@@ -817,10 +716,6 @@ MultiFileIncludedNativeComponentProps::MultiFileIncludedNativeComponentProps(
     disabled(convertRawProp(context, rawProps, \\"disabled\\", sourceProps.disabled, {true})) {}
     
 #ifdef RN_SERIALIZABLE_STATE
-ComponentName MultiFileIncludedNativeComponentProps::getDiffPropsImplementationTarget() const {
-  return \\"MultiFileIncludedNativeComponent\\";
-}
-
 folly::dynamic MultiFileIncludedNativeComponentProps::getDiffProps(
     const Props* prevProps) const {
   static const auto defaultProps = MultiFileIncludedNativeComponentProps();
@@ -875,10 +770,6 @@ FloatPropNativeComponentProps::FloatPropNativeComponentProps(
     blurRadius6(convertRawProp(context, rawProps, \\"blurRadius6\\", sourceProps.blurRadius6, {0.0})) {}
     
 #ifdef RN_SERIALIZABLE_STATE
-ComponentName FloatPropNativeComponentProps::getDiffPropsImplementationTarget() const {
-  return \\"FloatPropNativeComponent\\";
-}
-
 folly::dynamic FloatPropNativeComponentProps::getDiffProps(
     const Props* prevProps) const {
   static const auto defaultProps = FloatPropNativeComponentProps();
@@ -949,10 +840,6 @@ ImagePropNativeComponentProps::ImagePropNativeComponentProps(
     thumbImage(convertRawProp(context, rawProps, \\"thumbImage\\", sourceProps.thumbImage, {})) {}
     
 #ifdef RN_SERIALIZABLE_STATE
-ComponentName ImagePropNativeComponentProps::getDiffPropsImplementationTarget() const {
-  return \\"ImagePropNativeComponent\\";
-}
-
 folly::dynamic ImagePropNativeComponentProps::getDiffProps(
     const Props* prevProps) const {
   static const auto defaultProps = ImagePropNativeComponentProps();
@@ -965,7 +852,7 @@ folly::dynamic ImagePropNativeComponentProps::getDiffProps(
   folly::dynamic result = HostPlatformViewProps::getDiffProps(prevProps);
   
   if (thumbImage != oldProps->thumbImage) {
-    result[\\"thumbImage\\"] = toDynamic(thumbImage);
+    result[\\"thumbImage\\"] = thumbImage.toDynamic();
   }
   return result;
 }
@@ -1002,10 +889,6 @@ InsetsPropNativeComponentProps::InsetsPropNativeComponentProps(
     contentInset(convertRawProp(context, rawProps, \\"contentInset\\", sourceProps.contentInset, {})) {}
     
 #ifdef RN_SERIALIZABLE_STATE
-ComponentName InsetsPropNativeComponentProps::getDiffPropsImplementationTarget() const {
-  return \\"InsetsPropNativeComponent\\";
-}
-
 folly::dynamic InsetsPropNativeComponentProps::getDiffProps(
     const Props* prevProps) const {
   static const auto defaultProps = InsetsPropNativeComponentProps();
@@ -1017,9 +900,6 @@ folly::dynamic InsetsPropNativeComponentProps::getDiffProps(
   }
   folly::dynamic result = HostPlatformViewProps::getDiffProps(prevProps);
   
-  if (contentInset != oldProps->contentInset) {
-    result[\\"contentInset\\"] = toDynamic(contentInset);
-  }
   return result;
 }
 #endif
@@ -1055,10 +935,6 @@ Int32EnumPropsNativeComponentProps::Int32EnumPropsNativeComponentProps(
     maxInterval(convertRawProp(context, rawProps, \\"maxInterval\\", sourceProps.maxInterval, {Int32EnumPropsNativeComponentMaxInterval::MaxInterval0})) {}
     
 #ifdef RN_SERIALIZABLE_STATE
-ComponentName Int32EnumPropsNativeComponentProps::getDiffPropsImplementationTarget() const {
-  return \\"Int32EnumPropsNativeComponent\\";
-}
-
 folly::dynamic Int32EnumPropsNativeComponentProps::getDiffProps(
     const Props* prevProps) const {
   static const auto defaultProps = Int32EnumPropsNativeComponentProps();
@@ -1070,9 +946,6 @@ folly::dynamic Int32EnumPropsNativeComponentProps::getDiffProps(
   }
   folly::dynamic result = HostPlatformViewProps::getDiffProps(prevProps);
   
-  if (maxInterval != oldProps->maxInterval) {
-    result[\\"maxInterval\\"] = toDynamic(maxInterval);
-  }
   return result;
 }
 #endif
@@ -1110,10 +983,6 @@ IntegerPropNativeComponentProps::IntegerPropNativeComponentProps(
     progress3(convertRawProp(context, rawProps, \\"progress3\\", sourceProps.progress3, {10})) {}
     
 #ifdef RN_SERIALIZABLE_STATE
-ComponentName IntegerPropNativeComponentProps::getDiffPropsImplementationTarget() const {
-  return \\"IntegerPropNativeComponent\\";
-}
-
 folly::dynamic IntegerPropNativeComponentProps::getDiffProps(
     const Props* prevProps) const {
   static const auto defaultProps = IntegerPropNativeComponentProps();
@@ -1171,10 +1040,6 @@ InterfaceOnlyComponentProps::InterfaceOnlyComponentProps(
     accessibilityHint(convertRawProp(context, rawProps, \\"accessibilityHint\\", sourceProps.accessibilityHint, {\\"\\"})) {}
     
 #ifdef RN_SERIALIZABLE_STATE
-ComponentName InterfaceOnlyComponentProps::getDiffPropsImplementationTarget() const {
-  return \\"InterfaceOnlyComponent\\";
-}
-
 folly::dynamic InterfaceOnlyComponentProps::getDiffProps(
     const Props* prevProps) const {
   static const auto defaultProps = InterfaceOnlyComponentProps();
@@ -1225,10 +1090,6 @@ MixedPropNativeComponentProps::MixedPropNativeComponentProps(
     mixedProp(convertRawProp(context, rawProps, \\"mixedProp\\", sourceProps.mixedProp, {})) {}
     
 #ifdef RN_SERIALIZABLE_STATE
-ComponentName MixedPropNativeComponentProps::getDiffPropsImplementationTarget() const {
-  return \\"MixedPropNativeComponent\\";
-}
-
 folly::dynamic MixedPropNativeComponentProps::getDiffProps(
     const Props* prevProps) const {
   static const auto defaultProps = MixedPropNativeComponentProps();
@@ -1240,9 +1101,6 @@ folly::dynamic MixedPropNativeComponentProps::getDiffProps(
   }
   folly::dynamic result = HostPlatformViewProps::getDiffProps(prevProps);
   
-  if (mixedProp != oldProps->mixedProp) {
-    result[\\"mixedProp\\"] = mixedProp;
-  }
   return result;
 }
 #endif
@@ -1282,10 +1140,6 @@ ImageColorPropNativeComponentProps::ImageColorPropNativeComponentProps(
     point(convertRawProp(context, rawProps, \\"point\\", sourceProps.point, {})) {}
     
 #ifdef RN_SERIALIZABLE_STATE
-ComponentName ImageColorPropNativeComponentProps::getDiffPropsImplementationTarget() const {
-  return \\"ImageColorPropNativeComponent\\";
-}
-
 folly::dynamic ImageColorPropNativeComponentProps::getDiffProps(
     const Props* prevProps) const {
   static const auto defaultProps = ImageColorPropNativeComponentProps();
@@ -1298,7 +1152,7 @@ folly::dynamic ImageColorPropNativeComponentProps::getDiffProps(
   folly::dynamic result = HostPlatformViewProps::getDiffProps(prevProps);
   
   if (thumbImage != oldProps->thumbImage) {
-    result[\\"thumbImage\\"] = toDynamic(thumbImage);
+    result[\\"thumbImage\\"] = thumbImage.toDynamic();
   }
     
   if (color != oldProps->color) {
@@ -1310,7 +1164,10 @@ folly::dynamic ImageColorPropNativeComponentProps::getDiffProps(
   }
     
   if (point != oldProps->point) {
-    result[\\"point\\"] = toDynamic(point);
+    folly::dynamic pointResult = folly::dynamic::object();
+    pointResult[\\"x\\"] = point.x;
+    pointResult[\\"y\\"] = point.y;
+    result[\\"point\\"] = pointResult;
   }
   return result;
 }
@@ -1347,10 +1204,6 @@ NoPropsNoEventsComponentProps::NoPropsNoEventsComponentProps(
      {}
     
 #ifdef RN_SERIALIZABLE_STATE
-ComponentName NoPropsNoEventsComponentProps::getDiffPropsImplementationTarget() const {
-  return \\"NoPropsNoEventsComponent\\";
-}
-
 folly::dynamic NoPropsNoEventsComponentProps::getDiffProps(
     const Props* prevProps) const {
   static const auto defaultProps = NoPropsNoEventsComponentProps();
@@ -1398,10 +1251,6 @@ ObjectPropsProps::ObjectPropsProps(
     objectProp(convertRawProp(context, rawProps, \\"objectProp\\", sourceProps.objectProp, {})) {}
     
 #ifdef RN_SERIALIZABLE_STATE
-ComponentName ObjectPropsProps::getDiffPropsImplementationTarget() const {
-  return \\"ObjectProps\\";
-}
-
 folly::dynamic ObjectPropsProps::getDiffProps(
     const Props* prevProps) const {
   static const auto defaultProps = ObjectPropsProps();
@@ -1413,9 +1262,6 @@ folly::dynamic ObjectPropsProps::getDiffProps(
   }
   folly::dynamic result = HostPlatformViewProps::getDiffProps(prevProps);
   
-  if (objectProp != oldProps->objectProp) {
-    result[\\"objectProp\\"] = toDynamic(objectProp);
-  }
   return result;
 }
 #endif
@@ -1451,10 +1297,6 @@ PointPropNativeComponentProps::PointPropNativeComponentProps(
     startPoint(convertRawProp(context, rawProps, \\"startPoint\\", sourceProps.startPoint, {})) {}
     
 #ifdef RN_SERIALIZABLE_STATE
-ComponentName PointPropNativeComponentProps::getDiffPropsImplementationTarget() const {
-  return \\"PointPropNativeComponent\\";
-}
-
 folly::dynamic PointPropNativeComponentProps::getDiffProps(
     const Props* prevProps) const {
   static const auto defaultProps = PointPropNativeComponentProps();
@@ -1467,7 +1309,10 @@ folly::dynamic PointPropNativeComponentProps::getDiffProps(
   folly::dynamic result = HostPlatformViewProps::getDiffProps(prevProps);
   
   if (startPoint != oldProps->startPoint) {
-    result[\\"startPoint\\"] = toDynamic(startPoint);
+    folly::dynamic pointResult = folly::dynamic::object();
+    pointResult[\\"x\\"] = startPoint.x;
+    pointResult[\\"y\\"] = startPoint.y;
+    result[\\"startPoint\\"] = pointResult;
   }
   return result;
 }
@@ -1504,10 +1349,6 @@ StringEnumPropsNativeComponentProps::StringEnumPropsNativeComponentProps(
     alignment(convertRawProp(context, rawProps, \\"alignment\\", sourceProps.alignment, {StringEnumPropsNativeComponentAlignment::Center})) {}
     
 #ifdef RN_SERIALIZABLE_STATE
-ComponentName StringEnumPropsNativeComponentProps::getDiffPropsImplementationTarget() const {
-  return \\"StringEnumPropsNativeComponent\\";
-}
-
 folly::dynamic StringEnumPropsNativeComponentProps::getDiffProps(
     const Props* prevProps) const {
   static const auto defaultProps = StringEnumPropsNativeComponentProps();
@@ -1519,9 +1360,6 @@ folly::dynamic StringEnumPropsNativeComponentProps::getDiffProps(
   }
   folly::dynamic result = HostPlatformViewProps::getDiffProps(prevProps);
   
-  if (alignment != oldProps->alignment) {
-    result[\\"alignment\\"] = toDynamic(alignment);
-  }
   return result;
 }
 #endif
@@ -1558,10 +1396,6 @@ StringPropComponentProps::StringPropComponentProps(
     accessibilityRole(convertRawProp(context, rawProps, \\"accessibilityRole\\", sourceProps.accessibilityRole, {})) {}
     
 #ifdef RN_SERIALIZABLE_STATE
-ComponentName StringPropComponentProps::getDiffPropsImplementationTarget() const {
-  return \\"StringPropComponent\\";
-}
-
 folly::dynamic StringPropComponentProps::getDiffProps(
     const Props* prevProps) const {
   static const auto defaultProps = StringPropComponentProps();
@@ -1615,10 +1449,6 @@ MultiFile1NativeComponentProps::MultiFile1NativeComponentProps(
     disabled(convertRawProp(context, rawProps, \\"disabled\\", sourceProps.disabled, {false})) {}
     
 #ifdef RN_SERIALIZABLE_STATE
-ComponentName MultiFile1NativeComponentProps::getDiffPropsImplementationTarget() const {
-  return \\"MultiFile1NativeComponent\\";
-}
-
 folly::dynamic MultiFile1NativeComponentProps::getDiffProps(
     const Props* prevProps) const {
   static const auto defaultProps = MultiFile1NativeComponentProps();
@@ -1644,10 +1474,6 @@ MultiFile2NativeComponentProps::MultiFile2NativeComponentProps(
     disabled(convertRawProp(context, rawProps, \\"disabled\\", sourceProps.disabled, {true})) {}
     
 #ifdef RN_SERIALIZABLE_STATE
-ComponentName MultiFile2NativeComponentProps::getDiffPropsImplementationTarget() const {
-  return \\"MultiFile2NativeComponent\\";
-}
-
 folly::dynamic MultiFile2NativeComponentProps::getDiffProps(
     const Props* prevProps) const {
   static const auto defaultProps = MultiFile2NativeComponentProps();
@@ -1697,10 +1523,6 @@ MultiComponent1NativeComponentProps::MultiComponent1NativeComponentProps(
     disabled(convertRawProp(context, rawProps, \\"disabled\\", sourceProps.disabled, {false})) {}
     
 #ifdef RN_SERIALIZABLE_STATE
-ComponentName MultiComponent1NativeComponentProps::getDiffPropsImplementationTarget() const {
-  return \\"MultiComponent1NativeComponent\\";
-}
-
 folly::dynamic MultiComponent1NativeComponentProps::getDiffProps(
     const Props* prevProps) const {
   static const auto defaultProps = MultiComponent1NativeComponentProps();
@@ -1726,10 +1548,6 @@ MultiComponent2NativeComponentProps::MultiComponent2NativeComponentProps(
     disabled(convertRawProp(context, rawProps, \\"disabled\\", sourceProps.disabled, {true})) {}
     
 #ifdef RN_SERIALIZABLE_STATE
-ComponentName MultiComponent2NativeComponentProps::getDiffPropsImplementationTarget() const {
-  return \\"MultiComponent2NativeComponent\\";
-}
-
 folly::dynamic MultiComponent2NativeComponentProps::getDiffProps(
     const Props* prevProps) const {
   static const auto defaultProps = MultiComponent2NativeComponentProps();

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

@@ -16,7 +16,6 @@ Map {
 #include <cinttypes>
 #include <react/renderer/components/view/ViewProps.h>
 #include <react/renderer/core/PropsParserContext.h>
-#include <react/renderer/core/graphicsConversions.h>
 #include <react/renderer/core/propsConversions.h>
 #include <react/renderer/graphics/Color.h>
 #include <react/renderer/graphics/Point.h>
@@ -87,16 +86,6 @@ static inline std::string toString(const ArrayPropsNativeComponentSizesMaskWrapp
 }
 struct ArrayPropsNativeComponentObjectStruct {
   std::string stringProp{\\"\\"};
-
-#ifdef RN_SERIALIZABLE_STATE
-  bool operator==(const ArrayPropsNativeComponentObjectStruct&) const = default;
-
-  folly::dynamic toDynamic() const {
-    folly::dynamic result = folly::dynamic::object();
-    result[\\"stringProp\\"] = stringProp;
-    return result;
-  }
-#endif
 };
 
 static inline void fromRawValue(const PropsParserContext& context, const RawValue &value, ArrayPropsNativeComponentObjectStruct &result) {
@@ -112,12 +101,6 @@ static inline std::string toString(const ArrayPropsNativeComponentObjectStruct &
   return \\"[Object ArrayPropsNativeComponentObjectStruct]\\";
 }
 
-#ifdef RN_SERIALIZABLE_STATE
-static inline folly::dynamic toDynamic(const ArrayPropsNativeComponentObjectStruct &value) {
-  return value.toDynamic();
-}
-#endif
-
 static inline void fromRawValue(const PropsParserContext& context, const RawValue &value, std::vector<ArrayPropsNativeComponentObjectStruct> &result) {
   auto items = (std::vector<RawValue>)value;
   for (const auto &item : items) {
@@ -130,16 +113,6 @@ static inline void fromRawValue(const PropsParserContext& context, const RawValu
 
 struct ArrayPropsNativeComponentArrayObjectStruct {
   std::string stringProp{\\"\\"};
-
-#ifdef RN_SERIALIZABLE_STATE
-  bool operator==(const ArrayPropsNativeComponentArrayObjectStruct&) const = default;
-
-  folly::dynamic toDynamic() const {
-    folly::dynamic result = folly::dynamic::object();
-    result[\\"stringProp\\"] = stringProp;
-    return result;
-  }
-#endif
 };
 
 static inline void fromRawValue(const PropsParserContext& context, const RawValue &value, ArrayPropsNativeComponentArrayObjectStruct &result) {
@@ -155,12 +128,6 @@ static inline std::string toString(const ArrayPropsNativeComponentArrayObjectStr
   return \\"[Object ArrayPropsNativeComponentArrayObjectStruct]\\";
 }
 
-#ifdef RN_SERIALIZABLE_STATE
-static inline folly::dynamic toDynamic(const ArrayPropsNativeComponentArrayObjectStruct &value) {
-  return value.toDynamic();
-}
-#endif
-
 static inline void fromRawValue(const PropsParserContext& context, const RawValue &value, std::vector<ArrayPropsNativeComponentArrayObjectStruct> &result) {
   auto items = (std::vector<RawValue>)value;
   for (const auto &item : items) {
@@ -173,16 +140,6 @@ static inline void fromRawValue(const PropsParserContext& context, const RawValu
 
 struct ArrayPropsNativeComponentArrayStruct {
   std::vector<ArrayPropsNativeComponentArrayObjectStruct> object{};
-
-#ifdef RN_SERIALIZABLE_STATE
-  bool operator==(const ArrayPropsNativeComponentArrayStruct&) const = default;
-
-  folly::dynamic toDynamic() const {
-    folly::dynamic result = folly::dynamic::object();
-    result[\\"object\\"] = ::facebook::react::toDynamic(object);
-    return result;
-  }
-#endif
 };
 
 static inline void fromRawValue(const PropsParserContext& context, const RawValue &value, ArrayPropsNativeComponentArrayStruct &result) {
@@ -198,12 +155,6 @@ static inline std::string toString(const ArrayPropsNativeComponentArrayStruct &v
   return \\"[Object ArrayPropsNativeComponentArrayStruct]\\";
 }
 
-#ifdef RN_SERIALIZABLE_STATE
-static inline folly::dynamic toDynamic(const ArrayPropsNativeComponentArrayStruct &value) {
-  return value.toDynamic();
-}
-#endif
-
 static inline void fromRawValue(const PropsParserContext& context, const RawValue &value, std::vector<ArrayPropsNativeComponentArrayStruct> &result) {
   auto items = (std::vector<RawValue>)value;
   for (const auto &item : items) {
@@ -216,16 +167,6 @@ static inline void fromRawValue(const PropsParserContext& context, const RawValu
 
 struct ArrayPropsNativeComponentArrayOfArrayOfObjectStruct {
   std::string stringProp{\\"\\"};
-
-#ifdef RN_SERIALIZABLE_STATE
-  bool operator==(const ArrayPropsNativeComponentArrayOfArrayOfObjectStruct&) const = default;
-
-  folly::dynamic toDynamic() const {
-    folly::dynamic result = folly::dynamic::object();
-    result[\\"stringProp\\"] = stringProp;
-    return result;
-  }
-#endif
 };
 
 static inline void fromRawValue(const PropsParserContext& context, const RawValue &value, ArrayPropsNativeComponentArrayOfArrayOfObjectStruct &result) {
@@ -241,12 +182,6 @@ static inline std::string toString(const ArrayPropsNativeComponentArrayOfArrayOf
   return \\"[Object ArrayPropsNativeComponentArrayOfArrayOfObjectStruct]\\";
 }
 
-#ifdef RN_SERIALIZABLE_STATE
-static inline folly::dynamic toDynamic(const ArrayPropsNativeComponentArrayOfArrayOfObjectStruct &value) {
-  return value.toDynamic();
-}
-#endif
-
 static inline void fromRawValue(const PropsParserContext& context, const RawValue &value, std::vector<std::vector<ArrayPropsNativeComponentArrayOfArrayOfObjectStruct>> &result) {
   auto items = (std::vector<std::vector<RawValue>>)value;
   for (const std::vector<RawValue> &item : items) {
@@ -282,8 +217,6 @@ class ArrayPropsNativeComponentProps final : public ViewProps {
   std::vector<folly::dynamic> arrayOfMixed{};
 
   #ifdef RN_SERIALIZABLE_STATE
-  ComponentName getDiffPropsImplementationTarget() const override;
-
   folly::dynamic getDiffProps(const Props* prevProps) const override;
   #endif
 };
@@ -321,18 +254,6 @@ struct ArrayPropsNativeComponentNativePrimitivesStruct {
   std::vector<SharedColor> colors{};
   std::vector<ImageSource> srcs{};
   std::vector<Point> points{};
-
-#ifdef RN_SERIALIZABLE_STATE
-  bool operator==(const ArrayPropsNativeComponentNativePrimitivesStruct&) const = default;
-
-  folly::dynamic toDynamic() const {
-    folly::dynamic result = folly::dynamic::object();
-    result[\\"colors\\"] = ::facebook::react::toDynamic(colors);
-    result[\\"srcs\\"] = ::facebook::react::toDynamic(srcs);
-    result[\\"points\\"] = ::facebook::react::toDynamic(points);
-    return result;
-  }
-#endif
 };
 
 static inline void fromRawValue(const PropsParserContext& context, const RawValue &value, ArrayPropsNativeComponentNativePrimitivesStruct &result) {
@@ -356,12 +277,6 @@ static inline std::string toString(const ArrayPropsNativeComponentNativePrimitiv
   return \\"[Object ArrayPropsNativeComponentNativePrimitivesStruct]\\";
 }
 
-#ifdef RN_SERIALIZABLE_STATE
-static inline folly::dynamic toDynamic(const ArrayPropsNativeComponentNativePrimitivesStruct &value) {
-  return value.toDynamic();
-}
-#endif
-
 static inline void fromRawValue(const PropsParserContext& context, const RawValue &value, std::vector<ArrayPropsNativeComponentNativePrimitivesStruct> &result) {
   auto items = (std::vector<RawValue>)value;
   for (const auto &item : items) {
@@ -381,8 +296,6 @@ class ArrayPropsNativeComponentProps final : public ViewProps {
   std::vector<ArrayPropsNativeComponentNativePrimitivesStruct> nativePrimitives{};
 
   #ifdef RN_SERIALIZABLE_STATE
-  ComponentName getDiffPropsImplementationTarget() const override;
-
   folly::dynamic getDiffProps(const Props* prevProps) const override;
   #endif
 };
@@ -420,8 +333,6 @@ class BooleanPropNativeComponentProps final : public ViewProps {
   bool disabled{false};
 
   #ifdef RN_SERIALIZABLE_STATE
-  ComponentName getDiffPropsImplementationTarget() const override;
-
   folly::dynamic getDiffProps(const Props* prevProps) const override;
   #endif
 };
@@ -460,8 +371,6 @@ class ColorPropNativeComponentProps final : public ViewProps {
   SharedColor tintColor{};
 
   #ifdef RN_SERIALIZABLE_STATE
-  ComponentName getDiffPropsImplementationTarget() const override;
-
   folly::dynamic getDiffProps(const Props* prevProps) const override;
   #endif
 };
@@ -499,8 +408,6 @@ class CommandNativeComponentProps final : public ViewProps {
   
 
   #ifdef RN_SERIALIZABLE_STATE
-  ComponentName getDiffPropsImplementationTarget() const override;
-
   folly::dynamic getDiffProps(const Props* prevProps) const override;
   #endif
 };
@@ -538,8 +445,6 @@ class CommandNativeComponentProps final : public ViewProps {
   std::string accessibilityHint{\\"\\"};
 
   #ifdef RN_SERIALIZABLE_STATE
-  ComponentName getDiffPropsImplementationTarget() const override;
-
   folly::dynamic getDiffProps(const Props* prevProps) const override;
   #endif
 };
@@ -564,7 +469,6 @@ Map {
 
 #include <react/renderer/components/view/ViewProps.h>
 #include <react/renderer/core/PropsParserContext.h>
-#include <react/renderer/core/graphicsConversions.h>
 #include <yoga/Yoga.h>
 
 namespace facebook::react {
@@ -579,8 +483,6 @@ class DimensionPropNativeComponentProps final : public ViewProps {
   YGValue marginBack{};
 
   #ifdef RN_SERIALIZABLE_STATE
-  ComponentName getDiffPropsImplementationTarget() const override;
-
   folly::dynamic getDiffProps(const Props* prevProps) const override;
   #endif
 };
@@ -623,8 +525,6 @@ class DoublePropNativeComponentProps final : public ViewProps {
   double blurRadius6{0.0};
 
   #ifdef RN_SERIALIZABLE_STATE
-  ComponentName getDiffPropsImplementationTarget() const override;
-
   folly::dynamic getDiffProps(const Props* prevProps) const override;
   #endif
 };
@@ -662,8 +562,6 @@ class EventsNestedObjectNativeComponentProps final : public ViewProps {
   bool disabled{false};
 
   #ifdef RN_SERIALIZABLE_STATE
-  ComponentName getDiffPropsImplementationTarget() const override;
-
   folly::dynamic getDiffProps(const Props* prevProps) const override;
   #endif
 };
@@ -701,8 +599,6 @@ class EventsNativeComponentProps final : public ViewProps {
   bool disabled{false};
 
   #ifdef RN_SERIALIZABLE_STATE
-  ComponentName getDiffPropsImplementationTarget() const override;
-
   folly::dynamic getDiffProps(const Props* prevProps) const override;
   #endif
 };
@@ -740,8 +636,6 @@ class InterfaceOnlyComponentProps final : public ViewProps {
   
 
   #ifdef RN_SERIALIZABLE_STATE
-  ComponentName getDiffPropsImplementationTarget() const override;
-
   folly::dynamic getDiffProps(const Props* prevProps) const override;
   #endif
 };
@@ -779,8 +673,6 @@ class ExcludedAndroidComponentProps final : public ViewProps {
   
 
   #ifdef RN_SERIALIZABLE_STATE
-  ComponentName getDiffPropsImplementationTarget() const override;
-
   folly::dynamic getDiffProps(const Props* prevProps) const override;
   #endif
 };
@@ -818,8 +710,6 @@ class ExcludedAndroidIosComponentProps final : public ViewProps {
   
 
   #ifdef RN_SERIALIZABLE_STATE
-  ComponentName getDiffPropsImplementationTarget() const override;
-
   folly::dynamic getDiffProps(const Props* prevProps) const override;
   #endif
 };
@@ -857,8 +747,6 @@ class ExcludedIosComponentProps final : public ViewProps {
   
 
   #ifdef RN_SERIALIZABLE_STATE
-  ComponentName getDiffPropsImplementationTarget() const override;
-
   folly::dynamic getDiffProps(const Props* prevProps) const override;
   #endif
 };
@@ -873,8 +761,6 @@ class MultiFileIncludedNativeComponentProps final : public ViewProps {
   bool disabled{true};
 
   #ifdef RN_SERIALIZABLE_STATE
-  ComponentName getDiffPropsImplementationTarget() const override;
-
   folly::dynamic getDiffProps(const Props* prevProps) const override;
   #endif
 };
@@ -917,8 +803,6 @@ class FloatPropNativeComponentProps final : public ViewProps {
   Float blurRadius6{0.0};
 
   #ifdef RN_SERIALIZABLE_STATE
-  ComponentName getDiffPropsImplementationTarget() const override;
-
   folly::dynamic getDiffProps(const Props* prevProps) const override;
   #endif
 };
@@ -957,8 +841,6 @@ class ImagePropNativeComponentProps final : public ViewProps {
   ImageSource thumbImage{};
 
   #ifdef RN_SERIALIZABLE_STATE
-  ComponentName getDiffPropsImplementationTarget() const override;
-
   folly::dynamic getDiffProps(const Props* prevProps) const override;
   #endif
 };
@@ -997,8 +879,6 @@ class InsetsPropNativeComponentProps final : public ViewProps {
   EdgeInsets contentInset{};
 
   #ifdef RN_SERIALIZABLE_STATE
-  ComponentName getDiffPropsImplementationTarget() const override;
-
   folly::dynamic getDiffProps(const Props* prevProps) const override;
   #endif
 };
@@ -1053,16 +933,6 @@ static inline std::string toString(const Int32EnumPropsNativeComponentMaxInterva
   }
 }
 
-#ifdef RN_SERIALIZABLE_STATE
-static inline folly::dynamic toDynamic(const Int32EnumPropsNativeComponentMaxInterval &value) {
-  switch (value) {
-    case Int32EnumPropsNativeComponentMaxInterval::MaxInterval0: return 0;
-    case Int32EnumPropsNativeComponentMaxInterval::MaxInterval1: return 1;
-    case Int32EnumPropsNativeComponentMaxInterval::MaxInterval2: return 2;
-  }
-}
-#endif
-
 class Int32EnumPropsNativeComponentProps final : public ViewProps {
  public:
   Int32EnumPropsNativeComponentProps() = default;
@@ -1073,8 +943,6 @@ class Int32EnumPropsNativeComponentProps final : public ViewProps {
   Int32EnumPropsNativeComponentMaxInterval maxInterval{Int32EnumPropsNativeComponentMaxInterval::MaxInterval0};
 
   #ifdef RN_SERIALIZABLE_STATE
-  ComponentName getDiffPropsImplementationTarget() const override;
-
   folly::dynamic getDiffProps(const Props* prevProps) const override;
   #endif
 };
@@ -1114,8 +982,6 @@ class IntegerPropNativeComponentProps final : public ViewProps {
   int progress3{10};
 
   #ifdef RN_SERIALIZABLE_STATE
-  ComponentName getDiffPropsImplementationTarget() const override;
-
   folly::dynamic getDiffProps(const Props* prevProps) const override;
   #endif
 };
@@ -1153,8 +1019,6 @@ class InterfaceOnlyComponentProps final : public ViewProps {
   std::string accessibilityHint{\\"\\"};
 
   #ifdef RN_SERIALIZABLE_STATE
-  ComponentName getDiffPropsImplementationTarget() const override;
-
   folly::dynamic getDiffProps(const Props* prevProps) const override;
   #endif
 };
@@ -1192,8 +1056,6 @@ class MixedPropNativeComponentProps final : public ViewProps {
   folly::dynamic mixedProp{};
 
   #ifdef RN_SERIALIZABLE_STATE
-  ComponentName getDiffPropsImplementationTarget() const override;
-
   folly::dynamic getDiffProps(const Props* prevProps) const override;
   #endif
 };
@@ -1237,8 +1099,6 @@ class ImageColorPropNativeComponentProps final : public ViewProps {
   Point point{};
 
   #ifdef RN_SERIALIZABLE_STATE
-  ComponentName getDiffPropsImplementationTarget() const override;
-
   folly::dynamic getDiffProps(const Props* prevProps) const override;
   #endif
 };
@@ -1276,8 +1136,6 @@ class NoPropsNoEventsComponentProps final : public ViewProps {
   
 
   #ifdef RN_SERIALIZABLE_STATE
-  ComponentName getDiffPropsImplementationTarget() const override;
-
   folly::dynamic getDiffProps(const Props* prevProps) const override;
   #endif
 };
@@ -1324,12 +1182,6 @@ static inline std::string toString(const ObjectPropsStringEnumProp &value) {
     case ObjectPropsStringEnumProp::Option1: return \\"option1\\";
   }
 }
-
-#ifdef RN_SERIALIZABLE_STATE
-static inline folly::dynamic toDynamic(const ObjectPropsStringEnumProp &value) {
-  return toString(value);
-}
-#endif
 enum class ObjectPropsIntEnumProp { IntEnumProp0 = 0 };
 
 static inline void fromRawValue(const PropsParserContext& context, const RawValue &value, ObjectPropsIntEnumProp &result) {
@@ -1348,26 +1200,8 @@ static inline std::string toString(const ObjectPropsIntEnumProp &value) {
     case ObjectPropsIntEnumProp::IntEnumProp0: return \\"0\\";
   }
 }
-
-#ifdef RN_SERIALIZABLE_STATE
-static inline folly::dynamic toDynamic(const ObjectPropsIntEnumProp &value) {
-  switch (value) {
-    case ObjectPropsIntEnumProp::IntEnumProp0: return 0;
-  }
-}
-#endif
 struct ObjectPropsObjectPropObjectArrayPropStruct {
   std::vector<std::string> array{};
-
-#ifdef RN_SERIALIZABLE_STATE
-  bool operator==(const ObjectPropsObjectPropObjectArrayPropStruct&) const = default;
-
-  folly::dynamic toDynamic() const {
-    folly::dynamic result = folly::dynamic::object();
-    result[\\"array\\"] = ::facebook::react::toDynamic(array);
-    return result;
-  }
-#endif
 };
 
 static inline void fromRawValue(const PropsParserContext& context, const RawValue &value, ObjectPropsObjectPropObjectArrayPropStruct &result) {
@@ -1383,28 +1217,10 @@ static inline std::string toString(const ObjectPropsObjectPropObjectArrayPropStr
   return \\"[Object ObjectPropsObjectPropObjectArrayPropStruct]\\";
 }
 
-#ifdef RN_SERIALIZABLE_STATE
-static inline folly::dynamic toDynamic(const ObjectPropsObjectPropObjectArrayPropStruct &value) {
-  return value.toDynamic();
-}
-#endif
-
 struct ObjectPropsObjectPropObjectPrimitiveRequiredPropStruct {
   ImageSource image{};
   SharedColor color{};
   Point point{};
-
-#ifdef RN_SERIALIZABLE_STATE
-  bool operator==(const ObjectPropsObjectPropObjectPrimitiveRequiredPropStruct&) const = default;
-
-  folly::dynamic toDynamic() const {
-    folly::dynamic result = folly::dynamic::object();
-    result[\\"image\\"] = ::facebook::react::toDynamic(image);
-    result[\\"color\\"] = ::facebook::react::toDynamic(color);
-    result[\\"point\\"] = ::facebook::react::toDynamic(point);
-    return result;
-  }
-#endif
 };
 
 static inline void fromRawValue(const PropsParserContext& context, const RawValue &value, ObjectPropsObjectPropObjectPrimitiveRequiredPropStruct &result) {
@@ -1428,24 +1244,8 @@ static inline std::string toString(const ObjectPropsObjectPropObjectPrimitiveReq
   return \\"[Object ObjectPropsObjectPropObjectPrimitiveRequiredPropStruct]\\";
 }
 
-#ifdef RN_SERIALIZABLE_STATE
-static inline folly::dynamic toDynamic(const ObjectPropsObjectPropObjectPrimitiveRequiredPropStruct &value) {
-  return value.toDynamic();
-}
-#endif
-
 struct ObjectPropsObjectPropNestedPropANestedPropBStruct {
   std::string nestedPropC{\\"\\"};
-
-#ifdef RN_SERIALIZABLE_STATE
-  bool operator==(const ObjectPropsObjectPropNestedPropANestedPropBStruct&) const = default;
-
-  folly::dynamic toDynamic() const {
-    folly::dynamic result = folly::dynamic::object();
-    result[\\"nestedPropC\\"] = nestedPropC;
-    return result;
-  }
-#endif
 };
 
 static inline void fromRawValue(const PropsParserContext& context, const RawValue &value, ObjectPropsObjectPropNestedPropANestedPropBStruct &result) {
@@ -1461,24 +1261,8 @@ static inline std::string toString(const ObjectPropsObjectPropNestedPropANestedP
   return \\"[Object ObjectPropsObjectPropNestedPropANestedPropBStruct]\\";
 }
 
-#ifdef RN_SERIALIZABLE_STATE
-static inline folly::dynamic toDynamic(const ObjectPropsObjectPropNestedPropANestedPropBStruct &value) {
-  return value.toDynamic();
-}
-#endif
-
 struct ObjectPropsObjectPropNestedPropAStruct {
   ObjectPropsObjectPropNestedPropANestedPropBStruct nestedPropB{};
-
-#ifdef RN_SERIALIZABLE_STATE
-  bool operator==(const ObjectPropsObjectPropNestedPropAStruct&) const = default;
-
-  folly::dynamic toDynamic() const {
-    folly::dynamic result = folly::dynamic::object();
-    result[\\"nestedPropB\\"] = ::facebook::react::toDynamic(nestedPropB);
-    return result;
-  }
-#endif
 };
 
 static inline void fromRawValue(const PropsParserContext& context, const RawValue &value, ObjectPropsObjectPropNestedPropAStruct &result) {
@@ -1494,24 +1278,8 @@ static inline std::string toString(const ObjectPropsObjectPropNestedPropAStruct
   return \\"[Object ObjectPropsObjectPropNestedPropAStruct]\\";
 }
 
-#ifdef RN_SERIALIZABLE_STATE
-static inline folly::dynamic toDynamic(const ObjectPropsObjectPropNestedPropAStruct &value) {
-  return value.toDynamic();
-}
-#endif
-
 struct ObjectPropsObjectPropNestedArrayAsPropertyArrayPropStruct {
   std::string stringProp{\\"\\"};
-
-#ifdef RN_SERIALIZABLE_STATE
-  bool operator==(const ObjectPropsObjectPropNestedArrayAsPropertyArrayPropStruct&) const = default;
-
-  folly::dynamic toDynamic() const {
-    folly::dynamic result = folly::dynamic::object();
-    result[\\"stringProp\\"] = stringProp;
-    return result;
-  }
-#endif
 };
 
 static inline void fromRawValue(const PropsParserContext& context, const RawValue &value, ObjectPropsObjectPropNestedArrayAsPropertyArrayPropStruct &result) {
@@ -1527,12 +1295,6 @@ static inline std::string toString(const ObjectPropsObjectPropNestedArrayAsPrope
   return \\"[Object ObjectPropsObjectPropNestedArrayAsPropertyArrayPropStruct]\\";
 }
 
-#ifdef RN_SERIALIZABLE_STATE
-static inline folly::dynamic toDynamic(const ObjectPropsObjectPropNestedArrayAsPropertyArrayPropStruct &value) {
-  return value.toDynamic();
-}
-#endif
-
 static inline void fromRawValue(const PropsParserContext& context, const RawValue &value, std::vector<ObjectPropsObjectPropNestedArrayAsPropertyArrayPropStruct> &result) {
   auto items = (std::vector<RawValue>)value;
   for (const auto &item : items) {
@@ -1545,16 +1307,6 @@ static inline void fromRawValue(const PropsParserContext& context, const RawValu
 
 struct ObjectPropsObjectPropNestedArrayAsPropertyStruct {
   std::vector<ObjectPropsObjectPropNestedArrayAsPropertyArrayPropStruct> arrayProp{};
-
-#ifdef RN_SERIALIZABLE_STATE
-  bool operator==(const ObjectPropsObjectPropNestedArrayAsPropertyStruct&) const = default;
-
-  folly::dynamic toDynamic() const {
-    folly::dynamic result = folly::dynamic::object();
-    result[\\"arrayProp\\"] = ::facebook::react::toDynamic(arrayProp);
-    return result;
-  }
-#endif
 };
 
 static inline void fromRawValue(const PropsParserContext& context, const RawValue &value, ObjectPropsObjectPropNestedArrayAsPropertyStruct &result) {
@@ -1570,12 +1322,6 @@ static inline std::string toString(const ObjectPropsObjectPropNestedArrayAsPrope
   return \\"[Object ObjectPropsObjectPropNestedArrayAsPropertyStruct]\\";
 }
 
-#ifdef RN_SERIALIZABLE_STATE
-static inline folly::dynamic toDynamic(const ObjectPropsObjectPropNestedArrayAsPropertyStruct &value) {
-  return value.toDynamic();
-}
-#endif
-
 struct ObjectPropsObjectPropStruct {
   std::string stringProp{\\"\\"};
   bool booleanProp{false};
@@ -1591,29 +1337,6 @@ struct ObjectPropsObjectPropStruct {
   ObjectPropsObjectPropObjectPrimitiveRequiredPropStruct objectPrimitiveRequiredProp{};
   ObjectPropsObjectPropNestedPropAStruct nestedPropA{};
   ObjectPropsObjectPropNestedArrayAsPropertyStruct nestedArrayAsProperty{};
-
-#ifdef RN_SERIALIZABLE_STATE
-  bool operator==(const ObjectPropsObjectPropStruct&) const = default;
-
-  folly::dynamic toDynamic() const {
-    folly::dynamic result = folly::dynamic::object();
-    result[\\"stringProp\\"] = stringProp;
-    result[\\"booleanProp\\"] = booleanProp;
-    result[\\"floatProp\\"] = floatProp;
-    result[\\"intProp\\"] = intProp;
-    result[\\"stringUserDefaultProp\\"] = stringUserDefaultProp;
-    result[\\"booleanUserDefaultProp\\"] = booleanUserDefaultProp;
-    result[\\"floatUserDefaultProp\\"] = floatUserDefaultProp;
-    result[\\"intUserDefaultProp\\"] = intUserDefaultProp;
-    result[\\"stringEnumProp\\"] = ::facebook::react::toDynamic(stringEnumProp);
-    result[\\"intEnumProp\\"] = ::facebook::react::toDynamic(intEnumProp);
-    result[\\"objectArrayProp\\"] = ::facebook::react::toDynamic(objectArrayProp);
-    result[\\"objectPrimitiveRequiredProp\\"] = ::facebook::react::toDynamic(objectPrimitiveRequiredProp);
-    result[\\"nestedPropA\\"] = ::facebook::react::toDynamic(nestedPropA);
-    result[\\"nestedArrayAsProperty\\"] = ::facebook::react::toDynamic(nestedArrayAsProperty);
-    return result;
-  }
-#endif
 };
 
 static inline void fromRawValue(const PropsParserContext& context, const RawValue &value, ObjectPropsObjectPropStruct &result) {
@@ -1680,12 +1403,6 @@ static inline void fromRawValue(const PropsParserContext& context, const RawValu
 static inline std::string toString(const ObjectPropsObjectPropStruct &value) {
   return \\"[Object ObjectPropsObjectPropStruct]\\";
 }
-
-#ifdef RN_SERIALIZABLE_STATE
-static inline folly::dynamic toDynamic(const ObjectPropsObjectPropStruct &value) {
-  return value.toDynamic();
-}
-#endif
 class ObjectPropsProps final : public ViewProps {
  public:
   ObjectPropsProps() = default;
@@ -1696,8 +1413,6 @@ class ObjectPropsProps final : public ViewProps {
   ObjectPropsObjectPropStruct objectProp{};
 
   #ifdef RN_SERIALIZABLE_STATE
-  ComponentName getDiffPropsImplementationTarget() const override;
-
   folly::dynamic getDiffProps(const Props* prevProps) const override;
   #endif
 };
@@ -1736,8 +1451,6 @@ class PointPropNativeComponentProps final : public ViewProps {
   Point startPoint{};
 
   #ifdef RN_SERIALIZABLE_STATE
-  ComponentName getDiffPropsImplementationTarget() const override;
-
   folly::dynamic getDiffProps(const Props* prevProps) const override;
   #endif
 };
@@ -1783,12 +1496,6 @@ static inline std::string toString(const StringEnumPropsNativeComponentAlignment
   }
 }
 
-#ifdef RN_SERIALIZABLE_STATE
-static inline folly::dynamic toDynamic(const StringEnumPropsNativeComponentAlignment &value) {
-  return toString(value);
-}
-#endif
-
 class StringEnumPropsNativeComponentProps final : public ViewProps {
  public:
   StringEnumPropsNativeComponentProps() = default;
@@ -1799,8 +1506,6 @@ class StringEnumPropsNativeComponentProps final : public ViewProps {
   StringEnumPropsNativeComponentAlignment alignment{StringEnumPropsNativeComponentAlignment::Center};
 
   #ifdef RN_SERIALIZABLE_STATE
-  ComponentName getDiffPropsImplementationTarget() const override;
-
   folly::dynamic getDiffProps(const Props* prevProps) const override;
   #endif
 };
@@ -1839,8 +1544,6 @@ class StringPropComponentProps final : public ViewProps {
   std::string accessibilityRole{};
 
   #ifdef RN_SERIALIZABLE_STATE
-  ComponentName getDiffPropsImplementationTarget() const override;
-
   folly::dynamic getDiffProps(const Props* prevProps) const override;
   #endif
 };
@@ -1878,8 +1581,6 @@ class MultiFile1NativeComponentProps final : public ViewProps {
   bool disabled{false};
 
   #ifdef RN_SERIALIZABLE_STATE
-  ComponentName getDiffPropsImplementationTarget() const override;
-
   folly::dynamic getDiffProps(const Props* prevProps) const override;
   #endif
 };
@@ -1894,8 +1595,6 @@ class MultiFile2NativeComponentProps final : public ViewProps {
   bool disabled{true};
 
   #ifdef RN_SERIALIZABLE_STATE
-  ComponentName getDiffPropsImplementationTarget() const override;
-
   folly::dynamic getDiffProps(const Props* prevProps) const override;
   #endif
 };
@@ -1933,8 +1632,6 @@ class MultiComponent1NativeComponentProps final : public ViewProps {
   bool disabled{false};
 
   #ifdef RN_SERIALIZABLE_STATE
-  ComponentName getDiffPropsImplementationTarget() const override;
-
   folly::dynamic getDiffProps(const Props* prevProps) const override;
   #endif
 };
@@ -1949,8 +1646,6 @@ class MultiComponent2NativeComponentProps final : public ViewProps {
   bool disabled{true};
 
   #ifdef RN_SERIALIZABLE_STATE
-  ComponentName getDiffPropsImplementationTarget() const override;
-
   folly::dynamic getDiffProps(const Props* prevProps) const override;
   #endif
 };

packages/react-native-codegen/src/parsers/consistency/__tests__/checkModuleSnaps-test.js

@@ -18,10 +18,7 @@ const flowFixtures = require('../../flow/modules/__test_fixtures__/fixtures.js')
 const tsFixtures = require('../../typescript/modules/__test_fixtures__/fixtures.js');
 const {compareSnaps, compareTsArraySnaps} = require('../compareSnaps.js');
 
-const flowExtraCases = [
-  'NATIVE_MODULE_WITH_OPAQUE_TYPES',
-  'PROMISE_WITH_COMMONLY_USED_TYPES',
-];
+const flowExtraCases = ['PROMISE_WITH_COMMONLY_USED_TYPES'];
 const tsExtraCases = [
   'NATIVE_MODULE_WITH_ARRAY2_WITH_ALIAS',
   'NATIVE_MODULE_WITH_ARRAY2_WITH_UNION_AND_TOUPLE',

packages/react-native-codegen/src/parsers/flow/modules/__test_fixtures__/fixtures.js

@@ -691,37 +691,6 @@ export default TurboModuleRegistry.getEnforcing<Spec>('SampleTurboModule');
 
 `;
 
-const NATIVE_MODULE_WITH_OPAQUE_TYPES = `
-/**
- * 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-local
- * @format
- */
-
-'use strict';
-
-import type {TurboModule} from '../RCTExport';
-import * as TurboModuleRegistry from '../TurboModuleRegistry';
-
-export opaque type Task = mixed;
-export opaque type TimeoutID = number;
-
-export interface Spec extends TurboModule {
-  +createTask: (callback: () => void) => Task;
-  +cancelTask: (task: Task) => void;
-
-  +setTimeout: (callback: () => void) => TimeoutID;
-  +clearTimeout: (timeoutID: TimeoutID) => void;
-}
-
-export default TurboModuleRegistry.getEnforcing<Spec>('SampleTurboModule');
-
-`;
-
 const ANDROID_ONLY_NATIVE_MODULE = `
 /**
  * Copyright (c) Meta Platforms, Inc. and affiliates.
@@ -1007,7 +976,6 @@ module.exports = {
   NATIVE_MODULE_WITH_UNION,
   NATIVE_MODULE_WITH_UNION_RETURN_TYPES,
   NATIVE_MODULE_WITH_EVENT_EMITTERS,
-  NATIVE_MODULE_WITH_OPAQUE_TYPES,
   EMPTY_NATIVE_MODULE,
   ANDROID_ONLY_NATIVE_MODULE,
   IOS_ONLY_NATIVE_MODULE,

packages/react-native-codegen/src/parsers/flow/modules/__tests__/__snapshots__/module-parser-snapshot-test.js.snap

@@ -2187,108 +2187,6 @@ exports[`RN Codegen Flow Parser can generate fixture NATIVE_MODULE_WITH_OBJECT_W
 }"
 `;
 
-exports[`RN Codegen Flow Parser can generate fixture NATIVE_MODULE_WITH_OPAQUE_TYPES 1`] = `
-"{
-  'modules': {
-    'NativeSampleTurboModule': {
-      'type': 'NativeModule',
-      'aliasMap': {},
-      'enumMap': {},
-      'spec': {
-        'eventEmitters': [],
-        'methods': [
-          {
-            'name': 'createTask',
-            'optional': false,
-            'typeAnnotation': {
-              'type': 'FunctionTypeAnnotation',
-              'returnTypeAnnotation': {
-                'type': 'GenericObjectTypeAnnotation'
-              },
-              'params': [
-                {
-                  'name': 'callback',
-                  'optional': false,
-                  'typeAnnotation': {
-                    'type': 'FunctionTypeAnnotation',
-                    'returnTypeAnnotation': {
-                      'type': 'VoidTypeAnnotation'
-                    },
-                    'params': []
-                  }
-                }
-              ]
-            }
-          },
-          {
-            'name': 'cancelTask',
-            'optional': false,
-            'typeAnnotation': {
-              'type': 'FunctionTypeAnnotation',
-              'returnTypeAnnotation': {
-                'type': 'VoidTypeAnnotation'
-              },
-              'params': [
-                {
-                  'name': 'task',
-                  'optional': false,
-                  'typeAnnotation': {
-                    'type': 'GenericObjectTypeAnnotation'
-                  }
-                }
-              ]
-            }
-          },
-          {
-            'name': 'setTimeout',
-            'optional': false,
-            'typeAnnotation': {
-              'type': 'FunctionTypeAnnotation',
-              'returnTypeAnnotation': {
-                'type': 'NumberTypeAnnotation'
-              },
-              'params': [
-                {
-                  'name': 'callback',
-                  'optional': false,
-                  'typeAnnotation': {
-                    'type': 'FunctionTypeAnnotation',
-                    'returnTypeAnnotation': {
-                      'type': 'VoidTypeAnnotation'
-                    },
-                    'params': []
-                  }
-                }
-              ]
-            }
-          },
-          {
-            'name': 'clearTimeout',
-            'optional': false,
-            'typeAnnotation': {
-              'type': 'FunctionTypeAnnotation',
-              'returnTypeAnnotation': {
-                'type': 'VoidTypeAnnotation'
-              },
-              'params': [
-                {
-                  'name': 'timeoutID',
-                  'optional': false,
-                  'typeAnnotation': {
-                    'type': 'NumberTypeAnnotation'
-                  }
-                }
-              ]
-            }
-          }
-        ]
-      },
-      'moduleName': 'SampleTurboModule'
-    }
-  }
-}"
-`;
-
 exports[`RN Codegen Flow Parser can generate fixture NATIVE_MODULE_WITH_PARTIALS 1`] = `
 "{
   'modules': {

packages/react-native-codegen/src/parsers/flow/parser.js

@@ -296,7 +296,6 @@ class FlowParser implements Parser {
         if (
           node.declaration != null &&
           (node.declaration.type === 'TypeAlias' ||
-            node.declaration.type === 'OpaqueType' ||
             node.declaration.type === 'InterfaceDeclaration')
         ) {
           types[node.declaration.id.name] = node.declaration;
@@ -310,7 +309,6 @@ class FlowParser implements Parser {
         types[node.declaration.id.name] = node.declaration;
       } else if (
         node.type === 'TypeAlias' ||
-        node.type === 'OpaqueType' ||
         node.type === 'InterfaceDeclaration' ||
         node.type === 'EnumDeclaration'
       ) {
@@ -545,10 +543,6 @@ class FlowParser implements Parser {
   }
 
   nextNodeForTypeAlias(typeAnnotation: $FlowFixMe): $FlowFixMe {
-    if (typeAnnotation.type === 'OpaqueType') {
-      return typeAnnotation.impltype;
-    }
-
     return typeAnnotation.right;
   }
 

packages/react-native-codegen/src/parsers/parsers-commons.js

@@ -1233,8 +1233,7 @@ function handleGenericTypeAnnotation(
   let node;
 
   switch (resolvedTypeAnnotation.type) {
-    case parser.typeAlias:
-    case 'OpaqueType': {
+    case parser.typeAlias: {
       typeResolutionStatus = getTypeResolutionStatus(
         'alias',
         typeAnnotation,

packages/react-native-popup-menu-android/package.json

@@ -24,7 +24,7 @@
     "@react-native/codegen": "0.80.0-main"
   },
   "peerDependencies": {
-    "@types/react": "^19.1.0",
+    "@types/react": "^19.0.0",
     "react": "*",
     "react-native": "*"
   },

packages/react-native-test-library/ios/RCTSampleNativeComponentViewManager.mm

@@ -9,8 +9,6 @@
 #import <React/RCTUIManager.h>
 #import <React/RCTViewManager.h>
 
-#import <string>
-
 static UIColor *UIColorFromHexString(const std::string hexString)
 {
   unsigned rgbValue = 0;

packages/react-native/Libraries/ActionSheetIOS/React-RCTActionSheet.podspec

@@ -26,7 +26,7 @@ Pod::Spec.new do |s|
   s.author                 = "Meta Platforms, Inc. and its affiliates"
   s.platforms              = min_supported_versions
   s.source                 = source
-  s.source_files           = podspec_sources("*.{m}", "")
+  s.source_files           = "*.{m}"
   s.preserve_paths         = "package.json", "LICENSE", "LICENSE-docs"
   s.header_dir             = "RCTActionSheet"
 

packages/react-native/Libraries/Animated/AnimatedEvent.js

@@ -29,7 +29,7 @@ export type EventConfig<T> = {
   platformConfig?: PlatformConfig,
 };
 
-export function attachNativeEventImpl(
+export function attachNativeEvent(
   viewRef: any,
   eventName: string,
   argMapping: $ReadOnlyArray<?Mapping>,
@@ -181,7 +181,7 @@ export class AnimatedEvent {
       'Only native driven events need to be attached.',
     );
 
-    this._attachedEvent = attachNativeEventImpl(
+    this._attachedEvent = attachNativeEvent(
       viewRef,
       eventName,
       this._argMapping,

packages/react-native/Libraries/Animated/AnimatedExports.js.flow

@@ -10,10 +10,6 @@
 
 import AnimatedImplementation from './AnimatedImplementation';
 
-export type {DecayAnimationConfig} from './animations/DecayAnimation';
-export type {SpringAnimationConfig} from './animations/SpringAnimation';
-export type {TimingAnimationConfig} from './animations/TimingAnimation';
-
 export {default as FlatList} from './components/AnimatedFlatList';
 export {default as Image} from './components/AnimatedImage';
 export {default as ScrollView} from './components/AnimatedScrollView';
@@ -37,7 +33,6 @@ export type {default as AnimatedNode} from './nodes/AnimatedNode';
 export type {default as AnimatedAddition} from './nodes/AnimatedAddition';
 export type {default as AnimatedDiffClamp} from './nodes/AnimatedDiffClamp';
 export type {default as AnimatedDivision} from './nodes/AnimatedDivision';
-export type {InterpolationConfigType as InterpolationConfig} from './nodes/AnimatedInterpolation';
 export type {default as AnimatedModulo} from './nodes/AnimatedModulo';
 export type {default as AnimatedMultiplication} from './nodes/AnimatedMultiplication';
 export type {default as AnimatedSubtraction} from './nodes/AnimatedSubtraction';

packages/react-native/Libraries/Animated/AnimatedImplementation.js

@@ -20,7 +20,7 @@ import type {DecayAnimationConfig} from './animations/DecayAnimation';
 import type {SpringAnimationConfig} from './animations/SpringAnimation';
 import type {TimingAnimationConfig} from './animations/TimingAnimation';
 
-import {AnimatedEvent, attachNativeEventImpl} from './AnimatedEvent';
+import {AnimatedEvent, attachNativeEvent} from './AnimatedEvent';
 import DecayAnimation from './animations/DecayAnimation';
 import SpringAnimation from './animations/SpringAnimation';
 import TimingAnimation from './animations/TimingAnimation';
@@ -47,39 +47,39 @@ export type CompositeAnimation = {
   ...
 };
 
-const addImpl = function (
+const add = function (
   a: AnimatedNode | number,
   b: AnimatedNode | number,
 ): AnimatedAddition {
   return new AnimatedAddition(a, b);
 };
 
-const subtractImpl = function (
+const subtract = function (
   a: AnimatedNode | number,
   b: AnimatedNode | number,
 ): AnimatedSubtraction {
   return new AnimatedSubtraction(a, b);
 };
 
-const divideImpl = function (
+const divide = function (
   a: AnimatedNode | number,
   b: AnimatedNode | number,
 ): AnimatedDivision {
   return new AnimatedDivision(a, b);
 };
 
-const multiplyImpl = function (
+const multiply = function (
   a: AnimatedNode | number,
   b: AnimatedNode | number,
 ): AnimatedMultiplication {
   return new AnimatedMultiplication(a, b);
 };
 
-const moduloImpl = function (a: AnimatedNode, modulus: number): AnimatedModulo {
+const modulo = function (a: AnimatedNode, modulus: number): AnimatedModulo {
   return new AnimatedModulo(a, modulus);
 };
 
-const diffClampImpl = function (
+const diffClamp = function (
   a: AnimatedNode,
   min: number,
   max: number,
@@ -120,7 +120,7 @@ const maybeVectorAnim = function (
     const aY = anim((value: AnimatedValueXY).y, configY);
     // We use `stopTogether: false` here because otherwise tracking will break
     // because the second animation will get stopped before it can update.
-    return parallelImpl([aX, aY], {stopTogether: false});
+    return parallel([aX, aY], {stopTogether: false});
   } else if (value instanceof AnimatedColor) {
     const configR = {...config};
     const configG = {...config};
@@ -146,12 +146,12 @@ const maybeVectorAnim = function (
     const aA = anim((value: AnimatedColor).a, configA);
     // We use `stopTogether: false` here because otherwise tracking will break
     // because the second animation will get stopped before it can update.
-    return parallelImpl([aR, aG, aB, aA], {stopTogether: false});
+    return parallel([aR, aG, aB, aA], {stopTogether: false});
   }
   return null;
 };
 
-const springImpl = function (
+const spring = function (
   value: AnimatedValue | AnimatedValueXY | AnimatedColor,
   config: SpringAnimationConfig,
 ): CompositeAnimation {
@@ -179,7 +179,7 @@ const springImpl = function (
     }
   };
   return (
-    maybeVectorAnim(value, config, springImpl) || {
+    maybeVectorAnim(value, config, spring) || {
       start: function (callback?: ?EndCallback): void {
         start(value, config, callback);
       },
@@ -204,7 +204,7 @@ const springImpl = function (
   );
 };
 
-const timingImpl = function (
+const timing = function (
   value: AnimatedValue | AnimatedValueXY | AnimatedColor,
   config: TimingAnimationConfig,
 ): CompositeAnimation {
@@ -233,7 +233,7 @@ const timingImpl = function (
   };
 
   return (
-    maybeVectorAnim(value, config, timingImpl) || {
+    maybeVectorAnim(value, config, timing) || {
       start: function (callback?: ?EndCallback, isLooping?: boolean): void {
         start(value, {...config, isLooping}, callback);
       },
@@ -258,7 +258,7 @@ const timingImpl = function (
   );
 };
 
-const decayImpl = function (
+const decay = function (
   value: AnimatedValue | AnimatedValueXY | AnimatedColor,
   config: DecayAnimationConfig,
 ): CompositeAnimation {
@@ -275,7 +275,7 @@ const decayImpl = function (
   };
 
   return (
-    maybeVectorAnim(value, config, decayImpl) || {
+    maybeVectorAnim(value, config, decay) || {
       start: function (callback?: ?EndCallback): void {
         start(value, config, callback);
       },
@@ -300,7 +300,7 @@ const decayImpl = function (
   );
 };
 
-const sequenceImpl = function (
+const sequence = function (
   animations: Array<CompositeAnimation>,
 ): CompositeAnimation {
   let current = 0;
@@ -363,7 +363,7 @@ type ParallelConfig = {
   stopTogether?: boolean,
   ...
 };
-const parallelImpl = function (
+const parallel = function (
   animations: Array<CompositeAnimation>,
   config?: ?ParallelConfig,
 ): CompositeAnimation {
@@ -431,9 +431,9 @@ const parallelImpl = function (
   return result;
 };
 
-const delayImpl = function (time: number): CompositeAnimation {
+const delay = function (time: number): CompositeAnimation {
   // Would be nice to make a specialized implementation
-  return timingImpl(new AnimatedValue(0), {
+  return timing(new AnimatedValue(0), {
     toValue: 0,
     delay: time,
     duration: 0,
@@ -441,13 +441,13 @@ const delayImpl = function (time: number): CompositeAnimation {
   });
 };
 
-const staggerImpl = function (
+const stagger = function (
   time: number,
   animations: Array<CompositeAnimation>,
 ): CompositeAnimation {
-  return parallelImpl(
+  return parallel(
     animations.map((animation, i) => {
-      return sequenceImpl([delayImpl(time * i), animation]);
+      return sequence([delay(time * i), animation]);
     }),
   );
 };
@@ -458,7 +458,7 @@ type LoopAnimationConfig = {
   ...
 };
 
-const loopImpl = function (
+const loop = function (
   animation: CompositeAnimation,
   // $FlowFixMe[prop-missing]
   {iterations = -1, resetBeforeIteration = true}: LoopAnimationConfig = {},
@@ -514,7 +514,7 @@ const loopImpl = function (
   };
 };
 
-function forkEventImpl(
+function forkEvent(
   event: ?AnimatedEvent | ?Function,
   listener: Function,
 ): AnimatedEvent | Function {
@@ -531,7 +531,7 @@ function forkEventImpl(
   }
 }
 
-function unforkEventImpl(
+function unforkEvent(
   event: ?AnimatedEvent | ?Function,
   listener: Function,
 ): void {
@@ -540,7 +540,7 @@ function unforkEventImpl(
   }
 }
 
-const eventImpl = function <T>(
+const event = function <T>(
   argMapping: $ReadOnlyArray<?Mapping>,
   config: EventConfig<T>,
 ): any {
@@ -606,25 +606,25 @@ export default {
    * See https://reactnative.dev/docs/animated#node
    */
   Node: AnimatedNode,
-  decay: decayImpl,
-  timing: timingImpl,
-  spring: springImpl,
-  add: addImpl,
-  subtract: subtractImpl,
-  divide: divideImpl,
-  multiply: multiplyImpl,
-  modulo: moduloImpl,
-  diffClamp: diffClampImpl,
-  delay: delayImpl,
-  sequence: sequenceImpl,
-  parallel: parallelImpl,
-  stagger: staggerImpl,
-  loop: loopImpl,
-  event: eventImpl,
+  decay,
+  timing,
+  spring,
+  add,
+  subtract,
+  divide,
+  multiply,
+  modulo,
+  diffClamp,
+  delay,
+  sequence,
+  parallel,
+  stagger,
+  loop,
+  event,
   createAnimatedComponent,
-  attachNativeEvent: attachNativeEventImpl,
-  forkEvent: forkEventImpl,
-  unforkEvent: unforkEventImpl,
+  attachNativeEvent,
+  forkEvent,
+  unforkEvent,
 
   /**
    * Expose Event class, so it can be used as a type for type checkers.

packages/react-native/Libraries/Animated/AnimatedMock.js

@@ -17,7 +17,7 @@ import type {DecayAnimationConfig} from './animations/DecayAnimation';
 import type {SpringAnimationConfig} from './animations/SpringAnimation';
 import type {TimingAnimationConfig} from './animations/TimingAnimation';
 
-import {AnimatedEvent, attachNativeEventImpl} from './AnimatedEvent';
+import {AnimatedEvent, attachNativeEvent} from './AnimatedEvent';
 import AnimatedImplementation from './AnimatedImplementation';
 import createAnimatedComponent from './createAnimatedComponent';
 import AnimatedColor from './nodes/AnimatedColor';
@@ -188,7 +188,7 @@ export default {
   loop,
   event: AnimatedImplementation.event,
   createAnimatedComponent,
-  attachNativeEvent: attachNativeEventImpl,
+  attachNativeEvent,
   forkEvent: AnimatedImplementation.forkEvent,
   unforkEvent: AnimatedImplementation.unforkEvent,
   Event: AnimatedEvent,

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

@@ -4,7 +4,6 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @fantom_flags cxxNativeAnimatedRemoveJsSync:*
  * @flow strict-local
  * @format
  */
@@ -17,8 +16,6 @@ import ensureInstance from '../../../src/private/__tests__/utilities/ensureInsta
 import * as Fantom from '@react-native/fantom';
 import {createRef} from 'react';
 import {Animated, View, useAnimatedValue} from 'react-native';
-import {allowStyleProp} from 'react-native/Libraries/Animated/NativeAnimatedAllowlist';
-import * as ReactNativeFeatureFlags from 'react-native/src/private/featureflags/ReactNativeFeatureFlags';
 import ReactNativeElement from 'react-native/src/private/webapis/dom/nodes/ReactNativeElement';
 
 test('moving box by 100 points', () => {
@@ -35,9 +32,11 @@ test('moving box by 100 points', () => {
           {
             width: 100,
             height: 100,
+            backgroundColor: 'red',
           },
           {transform: [{translateX}]},
         ]}
+        testID="box"
       />
     );
   }
@@ -76,15 +75,11 @@ test('moving box by 100 points', () => {
   Fantom.unstable_produceFramesForDuration(500);
 
   // Animation is completed now. C++ Animated will commit the final position to the shadow tree.
-  if (ReactNativeFeatureFlags.cxxNativeAnimatedRemoveJsSync()) {
-    expect(viewElement.getBoundingClientRect().x).toBe(100);
-    // TODO(T223344928): this shouldn't be neccessary
-    Fantom.runWorkLoop();
-  } else {
-    expect(viewElement.getBoundingClientRect().x).toBe(0);
-    Fantom.runWorkLoop(); // Animated still schedules a React state update for synchronisation to shadow tree
-  }
+  expect(viewElement.getBoundingClientRect().x).toBe(100);
 
+  // TODO: this shouldn't be needed but C++ Animated still schedules a React state update
+  // for synchronisation, even though it doesn't need to.
+  Fantom.runWorkLoop();
   expect(viewElement.getBoundingClientRect().x).toBe(100);
 });
 
@@ -148,392 +143,6 @@ test('animation driven by onScroll event', () => {
 
   expect(transform.translateY).toBeCloseTo(100, 0.001);
 
-  expect(viewElement.getBoundingClientRect().y).toBe(100);
-});
-
-test('animated opacity', () => {
-  let _opacity;
-  let _opacityAnimation;
-  const viewRef = createRef<HostInstance>();
-
-  function MyApp() {
-    const opacity = useAnimatedValue(1);
-    _opacity = opacity;
-    return (
-      <Animated.View
-        ref={viewRef}
-        style={[
-          {
-            width: 100,
-            height: 100,
-            opacity: opacity,
-          },
-        ]}
-      />
-    );
-  }
-
-  const root = Fantom.createRoot();
-
-  Fantom.runTask(() => {
-    root.render(<MyApp />);
-  });
-
-  const viewElement = ensureInstance(viewRef.current, ReactNativeElement);
-
-  expect(viewElement.getBoundingClientRect().x).toBe(0);
-
-  Fantom.runTask(() => {
-    _opacityAnimation = Animated.timing(_opacity, {
-      toValue: 0,
-      duration: 30,
-      useNativeDriver: true,
-    }).start();
-  });
-
-  Fantom.unstable_produceFramesForDuration(30);
-  expect(Fantom.unstable_getDirectManipulationProps(viewElement).opacity).toBe(
-    0,
-  );
-
-  // TODO: this shouldn't be neccessary since animation should be stopped after duration
-  Fantom.runTask(() => {
-    _opacityAnimation?.stop();
-  });
-
-  expect(root.getRenderedOutput({props: ['opacity']}).toJSX()).toEqual(
-    <rn-view opacity="0" />,
-  );
-});
-
-test('moving box by 50 points with offset 10', () => {
-  let _translateX;
-  const viewRef = createRef<HostInstance>();
-
-  function MyApp() {
-    const translateX = useAnimatedValue(0);
-    _translateX = translateX;
-    return (
-      <Animated.View
-        ref={viewRef}
-        style={[
-          {
-            width: 100,
-            height: 100,
-          },
-          {transform: [{translateX}]},
-        ]}
-      />
-    );
-  }
-
-  const root = Fantom.createRoot();
-
-  Fantom.runTask(() => {
-    root.render(<MyApp />);
-  });
-
-  const viewElement = ensureInstance(viewRef.current, ReactNativeElement);
-
-  expect(viewElement.getBoundingClientRect().x).toBe(0);
-
-  let finishValue = null;
-
-  Fantom.runTask(() => {
-    Animated.timing(_translateX, {
-      toValue: 50,
-      duration: 1000, // 1 second
-      useNativeDriver: true,
-    }).start(result => {
-      finishValue = result;
-    });
-  });
-
-  Fantom.runTask(() => {
-    _translateX.setOffset(10);
-  });
-
-  Fantom.unstable_produceFramesForDuration(500);
-
-  // shadow tree is not synchronised yet, position X is still 0.
-  expect(viewElement.getBoundingClientRect().x).toBe(0);
-
-  expect(
-    // $FlowFixMe[incompatible-use]
-    Fantom.unstable_getDirectManipulationProps(viewElement).transform[0]
-      .translateX,
-  ).toBeCloseTo(35, 0.001);
-
-  Fantom.unstable_produceFramesForDuration(500);
-
-  expect(
-    // $FlowFixMe[incompatible-use]
-    Fantom.unstable_getDirectManipulationProps(viewElement).transform[0]
-      .translateX,
-  ).toBeCloseTo(60, 0.001);
-
-  if (ReactNativeFeatureFlags.cxxNativeAnimatedRemoveJsSync()) {
-    expect(root.getRenderedOutput({props: ['transform']}).toJSX()).toEqual(
-      <rn-view transform='[{"translateX": 60.000000}]' />,
-    );
-    // TODO(T223344928): this shouldn't be neccessary
-    Fantom.runWorkLoop();
-  } else {
-    expect(root.getRenderedOutput({props: ['transform']}).toJSX()).toEqual(
-      <rn-view transform="[]" />,
-    );
-    Fantom.runWorkLoop(); // Animated still schedules a React state update for synchronisation to shadow tree
-  }
-
-  expect(root.getRenderedOutput({props: ['transform']}).toJSX()).toEqual(
-    <rn-view transform='[{"translateX": 60.000000}]' />, // // must include offset.
-  );
-
-  expect(finishValue?.finished).toBe(true);
-  expect(finishValue?.value).toBe(50); // must not include offset.
-  expect(finishValue?.offset).toBe(10);
-});
-
-describe('Value.flattenOffset', () => {
-  it('accumulates offset with onScroll value', () => {
-    const scrollViewRef = createRef<HostInstance>();
-    const viewRef = createRef<HostInstance>();
-    let _onScroll;
-
-    function PressableWithNativeDriver() {
-      _onScroll = useAnimatedValue(0);
-
-      return (
-        <View style={{flex: 1}}>
-          <Animated.View
-            ref={viewRef}
-            style={{
-              position: 'absolute',
-              width: 10,
-              height: 10,
-              transform: [{translateY: _onScroll}],
-            }}
-          />
-          <Animated.ScrollView
-            ref={scrollViewRef}
-            onScroll={Animated.event(
-              [
-                {
-                  nativeEvent: {
-                    contentOffset: {
-                      y: _onScroll,
-                    },
-                  },
-                },
-              ],
-              {useNativeDriver: true},
-            )}>
-            <View style={{height: 1000, width: 100}} />
-          </Animated.ScrollView>
-        </View>
-      );
-    }
-
-    const root = Fantom.createRoot();
-    Fantom.runTask(() => {
-      root.render(<PressableWithNativeDriver />);
-    });
-
-    const fn = jest.fn();
-    Fantom.runTask(() => {
-      _onScroll.addListener(fn);
-    });
-
-    const scrollViewelement = ensureInstance(
-      scrollViewRef.current,
-      ReactNativeElement,
-    );
-    const viewElement = ensureInstance(viewRef.current, ReactNativeElement);
-
-    Fantom.scrollTo(scrollViewelement, {
-      x: 0,
-      y: 10,
-    });
-
-    expect(fn).toBeCalledWith({value: 10});
-
-    Fantom.runTask(() => {
-      _onScroll.setOffset(15);
-      _onScroll.flattenOffset();
-    });
-
-    expect(fn).toHaveBeenCalledTimes(1);
-
-    Fantom.runTask(() => {
-      _onScroll.setOffset(15);
-    });
-
-    expect(fn).toHaveBeenCalledTimes(1);
-
-    let transform =
-      // $FlowFixMe[incompatible-use]
-      Fantom.unstable_getDirectManipulationProps(viewElement).transform[0];
-
-    expect(transform.translateY).toBeCloseTo(40, 0.001);
-
-    // TODO(T223344928): this shouldn't be neccessary with cxxNativeAnimatedRemoveJsSync:true
-    Fantom.runWorkLoop();
-  });
-});
-
-describe('Value.extractOffset', () => {
-  it('sets the offset value to the base value and resets the base value to zero', () => {
-    const scrollViewRef = createRef<HostInstance>();
-    const viewRef = createRef<HostInstance>();
-    let _onScroll;
-
-    function PressableWithNativeDriver() {
-      _onScroll = useAnimatedValue(0);
-
-      return (
-        <View style={{flex: 1}}>
-          <Animated.View
-            ref={viewRef}
-            style={{
-              position: 'absolute',
-              width: 10,
-              height: 10,
-              transform: [{translateY: _onScroll}],
-            }}
-          />
-          <Animated.ScrollView
-            ref={scrollViewRef}
-            onScroll={Animated.event(
-              [
-                {
-                  nativeEvent: {
-                    contentOffset: {
-                      y: _onScroll,
-                    },
-                  },
-                },
-              ],
-              {useNativeDriver: true},
-            )}>
-            <View style={{height: 1000, width: 100}} />
-          </Animated.ScrollView>
-        </View>
-      );
-    }
-
-    const root = Fantom.createRoot();
-    Fantom.runTask(() => {
-      root.render(<PressableWithNativeDriver />);
-    });
-
-    const fn = jest.fn();
-    Fantom.runTask(() => {
-      _onScroll.addListener(fn);
-    });
-
-    const scrollViewelement = ensureInstance(
-      scrollViewRef.current,
-      ReactNativeElement,
-    );
-    const viewElement = ensureInstance(viewRef.current, ReactNativeElement);
-
-    Fantom.scrollTo(scrollViewelement, {
-      x: 0,
-      y: 10,
-    });
-
-    expect(fn).toBeCalledWith({value: 10});
-
-    Fantom.runTask(() => {
-      _onScroll.setOffset(15);
-      // Sets offset to be 15 + 10 = 25 (this is not observable from JS).
-      _onScroll.extractOffset();
-    });
-
-    expect(fn).toHaveBeenCalledTimes(1);
-
-    let transform =
-      // $FlowFixMe[incompatible-use]
-      Fantom.unstable_getDirectManipulationProps(viewElement).transform[0];
-
-    // Animated value is now 0 but offset is 25. The final value is 25.
-    expect(transform.translateY).toBeCloseTo(25, 0.001);
-
-    Fantom.runTask(() => {
-      // Sets offset 35, overriding the previous `setOffset`.
-      // Due to `extractOffset`, base value was restarted to 0.
-      _onScroll.setOffset(35);
-    });
-
-    expect(fn).toHaveBeenCalledTimes(1);
-
-    transform =
-      // $FlowFixMe[incompatible-use]
-      Fantom.unstable_getDirectManipulationProps(viewElement).transform[0];
-
-    // `extractOffset` resets value back to 0.
-    // Previously we set offset to 35. The final value is 35.
-    expect(transform.translateY).toBeCloseTo(35, 0.001);
-
-    // TODO(T223344928): this shouldn't be neccessary with cxxNativeAnimatedRemoveJsSync:true
-    Fantom.runWorkLoop();
-  });
-});
-
-test('animate layout props', () => {
-  const viewRef = createRef<HostInstance>();
-  allowStyleProp('height');
-
-  let _animatedHeight;
-  let _heightAnimation;
-
-  function MyApp() {
-    const animatedHeight = useAnimatedValue(0);
-    _animatedHeight = animatedHeight;
-    return (
-      <Animated.View
-        ref={viewRef}
-        style={[
-          {
-            width: 100,
-            height: animatedHeight,
-          },
-        ]}
-      />
-    );
-  }
-
-  const root = Fantom.createRoot();
-
-  Fantom.runTask(() => {
-    root.render(<MyApp />);
-  });
-
-  const viewElement = ensureInstance(viewRef.current, ReactNativeElement);
-
-  Fantom.runTask(() => {
-    _heightAnimation = Animated.timing(_animatedHeight, {
-      toValue: 100,
-      duration: 10,
-      useNativeDriver: true,
-    }).start();
-  });
-
-  Fantom.unstable_produceFramesForDuration(10);
-
-  // TODO: this shouldn't be neccessary since animation should be stopped after duration
-  Fantom.runTask(() => {
-    _heightAnimation?.stop();
-  });
-
-  // $FlowFixMe[incompatible-use]
-  expect(Fantom.unstable_getDirectManipulationProps(viewElement).height).toBe(
-    100,
-  );
-
-  expect(Fantom.unstable_getFabricUpdateProps(viewElement).height).toBe(100);
-
-  expect(root.getRenderedOutput({props: ['height']}).toJSX()).toEqual(
-    <rn-view height="100.000000" />,
-  );
+  // TODO(T226364699): this should `toBe(100)` but we are not syncing shadow tree yet.
+  expect(viewElement.getBoundingClientRect().y).toBe(0);
 });

packages/react-native/Libraries/Animated/animations/Animation.js

@@ -13,7 +13,6 @@ import type AnimatedNode from '../nodes/AnimatedNode';
 import type AnimatedValue from '../nodes/AnimatedValue';
 
 import NativeAnimatedHelper from '../../../src/private/animated/NativeAnimatedHelper';
-import * as ReactNativeFeatureFlags from '../../../src/private/featureflags/ReactNativeFeatureFlags';
 import AnimatedProps from '../nodes/AnimatedProps';
 
 export type EndResult = {
@@ -150,15 +149,8 @@ export default class Animation {
           if (value != null) {
             animatedValue.__onAnimatedValueUpdateReceived(value, offset);
 
-            if (
-              !(
-                ReactNativeFeatureFlags.cxxNativeAnimatedEnabled() &&
-                ReactNativeFeatureFlags.cxxNativeAnimatedRemoveJsSync()
-              )
-            ) {
-              if (this.__isLooping === true) {
-                return;
-              }
+            if (this.__isLooping === true) {
+              return;
             }
 
             // Once the JS side node is synced with the updated values, trigger an

packages/react-native/Libraries/Animated/components/AnimatedScrollView.js

@@ -15,9 +15,7 @@ import type {
 } from '../createAnimatedComponent';
 
 import RefreshControl from '../../Components/RefreshControl/RefreshControl';
-import ScrollView, {
-  type ScrollViewProps,
-} from '../../Components/ScrollView/ScrollView';
+import ScrollView from '../../Components/ScrollView/ScrollView';
 import flattenStyle from '../../StyleSheet/flattenStyle';
 import splitLayoutProps from '../../StyleSheet/splitLayoutProps';
 import StyleSheet from '../../StyleSheet/StyleSheet';
@@ -28,20 +26,21 @@ import useAnimatedProps from '../useAnimatedProps';
 import * as React from 'react';
 import {cloneElement, useMemo} from 'react';
 
+type AnimatedScrollViewProps = React.ElementConfig<typeof ScrollView>;
 type AnimatedScrollViewInstance = React.ElementRef<typeof ScrollView>;
 
 /**
  * @see https://github.com/facebook/react-native/commit/b8c8562
  */
 const AnimatedScrollView: AnimatedComponentType<
-  ScrollViewProps,
+  AnimatedScrollViewProps,
   AnimatedScrollViewInstance,
 > = function AnimatedScrollViewWithOrWithoutInvertedRefreshControl({
   ref: forwardedRef,
   ...props
 }: {
   ref?: React.RefSetter<AnimatedScrollViewInstance>,
-  ...AnimatedProps<ScrollViewProps>,
+  ...AnimatedProps<AnimatedScrollViewProps>,
 }) {
   // (Android only) When a ScrollView has a RefreshControl and
   // any `style` property set with an Animated.Value, the CSS
@@ -112,7 +111,7 @@ const AnimatedScrollViewWithInvertedRefreshControl =
 
     // Handle animated props on `NativeDirectionalScrollView`.
     const [scrollViewAnimatedProps, scrollViewRef] = useAnimatedProps<
-      ScrollViewProps,
+      AnimatedScrollViewProps,
       AnimatedScrollViewInstance,
     >(intermediatePropsForScrollView);
     const ref = useMergeRefs<AnimatedScrollViewInstance>(

packages/react-native/Libraries/Animated/components/AnimatedText.js

@@ -10,10 +10,13 @@
 
 import type {AnimatedComponentType} from '../createAnimatedComponent';
 
-import Text, {type TextProps} from '../../Text/Text';
+import Text from '../../Text/Text';
 import createAnimatedComponent from '../createAnimatedComponent';
 import * as React from 'react';
 
 export default (createAnimatedComponent(
   (Text: $FlowFixMe),
-): AnimatedComponentType<TextProps, React.ElementRef<typeof Text>>);
+): AnimatedComponentType<
+  React.ElementConfig<typeof Text>,
+  React.ElementRef<typeof Text>,
+>);

packages/react-native/Libraries/Animated/components/AnimatedView.js

@@ -8,7 +8,6 @@
  * @format
  */
 
-import type {ViewProps} from '../../Components/View/ViewPropTypes';
 import type {AnimatedComponentType} from '../createAnimatedComponent';
 
 import View from '../../Components/View/View';
@@ -16,6 +15,6 @@ import createAnimatedComponent from '../createAnimatedComponent';
 import * as React from 'react';
 
 export default (createAnimatedComponent(View): AnimatedComponentType<
-  ViewProps,
+  React.ElementConfig<typeof View>,
   React.ElementRef<typeof View>,
 >);

packages/react-native/Libraries/Animated/createAnimatedComponent.js

@@ -21,7 +21,7 @@ import type AnimatedValue from './nodes/AnimatedValue';
 
 import createAnimatedPropsHook from '../../src/private/animated/createAnimatedPropsHook';
 import composeStyles from '../../src/private/styles/composeStyles';
-import {type ViewProps} from '../Components/View/ViewPropTypes';
+import View from '../Components/View/View';
 import useMergeRefs from '../Utilities/useMergeRefs';
 import * as React from 'react';
 import {useMemo} from 'react';
@@ -60,7 +60,9 @@ type NonAnimatedProps =
   | 'disabled'
   | 'accessibilityLabel';
 type PassThroughProps = $ReadOnly<{
-  passthroughAnimatedPropExplicitValues?: ViewProps | null,
+  passthroughAnimatedPropExplicitValues?: React.ElementConfig<
+    typeof View,
+  > | null,
 }>;
 
 export type AnimatedProps<Props: {...}> = {

packages/react-native/Libraries/AppDelegate/RCTAppSetupUtils.h

@@ -14,8 +14,12 @@
 #import <memory>
 
 #if USE_THIRD_PARTY_JSC != 1
+#if __has_include(<jsireact/HermesExecutorFactory.h>)
+#import <jsireact/HermesExecutorFactory.h>
+#elif __has_include(<reacthermes/HermesExecutorFactory.h>)
 #import <reacthermes/HermesExecutorFactory.h>
 #endif
+#endif
 
 #import <ReactCommon/RCTTurboModuleManager.h>
 #import <jsireact/JSIExecutor.h>

packages/react-native/Libraries/AppDelegate/React-RCTAppDelegate.podspec

@@ -42,7 +42,7 @@ Pod::Spec.new do |s|
   s.author                 = "Meta Platforms, Inc. and its affiliates"
   s.platforms              = min_supported_versions
   s.source                 = source
-  s.source_files           = podspec_sources("**/*.{c,h,m,mm,S,cpp}", "**/*.h")
+  s.source_files            = "**/*.{c,h,m,mm,S,cpp}"
 
   # This guard prevent to install the dependencies when we run `pod install` in the old architecture.
   s.compiler_flags = other_cflags

packages/react-native/Libraries/Blob/React-RCTBlob.podspec

@@ -30,7 +30,7 @@ Pod::Spec.new do |s|
   s.platforms              = min_supported_versions
   s.compiler_flags         = '-Wno-nullability-completeness'
   s.source                 = source
-  s.source_files           = podspec_sources("*.{h,m,mm}", "**/*.h")
+  s.source_files           = "*.{h,m,mm}"
   s.preserve_paths         = "package.json", "LICENSE", "LICENSE-docs"
   s.header_dir             = "RCTBlob"
   s.pod_target_xcconfig    = {

packages/react-native/Libraries/Components/Button.js

@@ -63,7 +63,6 @@ export type ButtonProps = $ReadOnly<{
     @platform tv
 
     @default false
-    @deprecated Use `focusable` instead
    */
   hasTVPreferredFocus?: ?boolean,
 
@@ -281,12 +280,10 @@ export type ButtonProps = $ReadOnly<{
   ```
  */
 
-const NativeTouchable:
-  | typeof TouchableNativeFeedback
-  | typeof TouchableOpacity =
+const Touchable: typeof TouchableNativeFeedback | typeof TouchableOpacity =
   Platform.OS === 'android' ? TouchableNativeFeedback : TouchableOpacity;
 
-type ButtonRef = React.ElementRef<typeof NativeTouchable>;
+type ButtonRef = React.ElementRef<typeof Touchable>;
 
 const Button: component(
   ref?: React.RefSetter<ButtonRef>,
@@ -364,7 +361,7 @@ const Button: component(
       : importantForAccessibility;
 
   return (
-    <NativeTouchable
+    <Touchable
       accessible={accessible}
       accessibilityActions={accessibilityActions}
       onAccessibilityAction={onAccessibilityAction}
@@ -393,7 +390,7 @@ const Button: component(
           {formattedTitle}
         </Text>
       </View>
-    </NativeTouchable>
+    </Touchable>
   );
 };
 

packages/react-native/Libraries/Components/Pressable/Pressable.js

@@ -8,7 +8,6 @@
  * @format
  */
 
-import type {ViewStyleProp} from '../../StyleSheet/StyleSheet';
 import type {
   GestureResponderEvent,
   LayoutChangeEvent,
@@ -27,6 +26,8 @@ import useAndroidRippleForView, {
 import * as React from 'react';
 import {memo, useMemo, useRef, useState} from 'react';
 
+type ViewStyleProp = React.ElementConfig<typeof View>['style'];
+
 export type {PressableAndroidRippleConfig};
 
 export type PressableStateCallbackType = $ReadOnly<{

packages/react-native/Libraries/Components/SafeAreaView/SafeAreaView.d.ts

@@ -13,21 +13,12 @@ import {NativeMethods} from '../../../types/public/ReactNativeTypes';
 import {ViewProps} from '../View/ViewPropTypes';
 
 /**
- * @deprecated
- * Use `react-native-safe-area-context` instead. This component is deprecated and will be removed in a future release.
- *
  * Renders nested content and automatically applies paddings reflect the portion of the view
  * that is not covered by navigation bars, tab bars, toolbars, and other ancestor views.
  * Moreover, and most importantly, Safe Area's paddings reflect physical limitation of the screen,
  * such as rounded corners or camera notches (aka sensor housing area on iPhone X).
  */
 declare class SafeAreaViewComponent extends React.Component<ViewProps> {}
-
 declare const SafeAreaViewBase: Constructor<NativeMethods> &
   typeof SafeAreaViewComponent;
-
-/**
- * @deprecated
- * Use `react-native-safe-area-context` instead. This component is deprecated and will be removed in a future release.
- */
 export class SafeAreaView extends SafeAreaViewBase {}

packages/react-native/Libraries/Components/SafeAreaView/SafeAreaView.js

@@ -22,9 +22,8 @@ import * as React from 'react';
  * Moreover, and most importantly, Safe Area's paddings reflect physical
  * limitation of the screen, such as rounded corners or camera notches (aka
  * sensor housing area on iPhone X).
- * @deprecated Use `react-native-safe-area-context` instead. This component will be removed in a future release.
  */
-const SafeAreaView: component(
+const exported: component(
   ref?: React.RefSetter<React.ElementRef<typeof View>>,
   ...props: ViewProps
 ) = Platform.select({
@@ -32,4 +31,4 @@ const SafeAreaView: component(
   default: View,
 });
 
-export default SafeAreaView;
+export default exported;

packages/react-native/Libraries/Components/ScrollView/ScrollView.d.ts

@@ -10,7 +10,6 @@
 import type * as React from 'react';
 import {Constructor} from '../../../types/private/Utilities';
 import {Insets} from '../../../types/public/Insets';
-import {HostInstance} from '../../../types/public/ReactNativeTypes';
 import {ColorValue, StyleProp} from '../../StyleSheet/StyleSheet';
 import {ViewStyle} from '../../StyleSheet/StyleSheetTypes';
 import {
@@ -879,12 +878,6 @@ export class ScrollView extends ScrollViewBase {
   // Undocumented
   getInnerViewNode(): any;
 
-  /**
-   * Returns a reference to the underlying native scroll view, or null if the
-   * native instance is not mounted.
-   */
-  getNativeScrollRef: () => HostInstance | null;
-
   /**
    * @deprecated Use scrollTo instead
    */

packages/react-native/Libraries/Components/ScrollView/ScrollView.js

@@ -1480,7 +1480,6 @@ class ScrollView extends React.Component<ScrollViewProps, ScrollViewState> {
       // then the second tap goes to the actual interior view)
       const {keyboardShouldPersistTaps} = this.props;
       const keyboardNeverPersistTaps =
-        // $FlowFixMe[sketchy-null-bool]
         !keyboardShouldPersistTaps || keyboardShouldPersistTaps === 'never';
 
       if (typeof e.target === 'number') {
@@ -1563,7 +1562,6 @@ class ScrollView extends React.Component<ScrollViewProps, ScrollViewState> {
 
     const {keyboardShouldPersistTaps} = this.props;
     const keyboardNeverPersistsTaps =
-      // $FlowFixMe[sketchy-null-bool]
       !keyboardShouldPersistTaps || keyboardShouldPersistTaps === 'never';
 
     // Dismiss the keyboard now if we didn't become responder in capture phase

packages/react-native/Libraries/Components/StatusBar/StatusBar.d.ts

@@ -35,8 +35,6 @@ export interface StatusBarPropsAndroid {
   /**
    * The background color of the status bar.
    *
-   * Please note that this prop has no effect on Android 15+
-   *
    * @platform android
    */
   backgroundColor?: ColorValue | undefined;
@@ -46,8 +44,6 @@ export interface StatusBarPropsAndroid {
    * the app will draw under the status bar. This is useful when using a
    * semi transparent status bar color.
    *
-   * Please note that this prop has no effect on Android 15+
-   *
    * @platform android
    */
   translucent?: boolean | undefined;

packages/react-native/Libraries/Components/StatusBar/StatusBar.js

@@ -58,9 +58,6 @@ export type StatusBarAnimation = $Keys<{
 export type StatusBarPropsAndroid = $ReadOnly<{
   /**
    * The background color of the status bar.
-   *
-   * Please note that this prop has no effect on Android 15+
-   *
    * @platform android
    */
   backgroundColor?: ?ColorValue,
@@ -69,8 +66,6 @@ export type StatusBarPropsAndroid = $ReadOnly<{
    * When translucent is set to true, the app will draw under the status bar.
    * This is useful when using a semi transparent status bar color.
    *
-   * Please note that this prop has no effect on Android 15+
-   *
    * @platform android
    */
   translucent?: ?boolean,

packages/react-native/Libraries/Components/Touchable/TouchableHighlight.js

@@ -30,9 +30,6 @@ type AndroidProps = $ReadOnly<{
 }>;
 
 type IOSProps = $ReadOnly<{
-  /**
-   * @deprecated Use `focusable` instead
-   */
   hasTVPreferredFocus?: ?boolean,
 }>;
 

packages/react-native/Libraries/Components/Touchable/TouchableNativeFeedback.js

@@ -29,7 +29,6 @@ type TVProps = {
    * *(Apple TV only)* TV preferred focus (see documentation for the View component).
    *
    * @platform ios
-   * @deprecated Use `focusable` instead
    */
   hasTVPreferredFocus?: ?boolean,
 

packages/react-native/Libraries/Components/Touchable/TouchableOpacity.d.ts

@@ -16,7 +16,6 @@ export interface TVProps {
    * *(Apple TV only)* TV preferred focus (see documentation for the View component).
    *
    * @platform ios
-   * @deprecated Use `focusable` instead
    */
   hasTVPreferredFocus?: boolean | undefined;
 

packages/react-native/Libraries/Components/Touchable/TouchableOpacity.js

@@ -26,7 +26,6 @@ export type TVProps = $ReadOnly<{
    * *(Apple TV only)* TV preferred focus (see documentation for the View component).
    *
    * @platform ios
-   * @deprecated Use `focusable` instead
    */
   hasTVPreferredFocus?: ?boolean,
 

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

@@ -16,6 +16,11 @@ import ViewNativeComponent from './ViewNativeComponent';
 import * as React from 'react';
 import {use} from 'react';
 
+type PropsWithRef = $ReadOnly<{
+  ref?: React.RefSetter<React.ElementRef<typeof ViewNativeComponent>>,
+  ...ViewProps,
+}>;
+
 /**
  * The most fundamental component for building a UI, View is a container that
  * supports layout with flexbox, style, some touch handling, and accessibility
@@ -23,10 +28,7 @@ import {use} from 'react';
  *
  * @see https://reactnative.dev/docs/view
  */
-export default component View(
-  ref?: React.RefSetter<React.ElementRef<typeof ViewNativeComponent>>,
-  ...props: ViewProps
-) {
+function View(props: PropsWithRef): React.Node {
   const hasTextAncestor = use(TextAncestor);
 
   let actualView;
@@ -53,7 +55,7 @@ export default component View(
     } = props;
 
     // Since we destructured props, we can now treat it as mutable
-    const processedProps = otherProps as {...ViewProps};
+    const processedProps = otherProps as {...PropsWithRef};
 
     const parsedAriaLabelledBy = ariaLabelledBy?.split(/\s*,\s*/g);
     if (parsedAriaLabelledBy !== undefined) {
@@ -116,12 +118,7 @@ export default component View(
       };
     }
 
-    actualView =
-      ref == null ? (
-        <ViewNativeComponent {...processedProps} />
-      ) : (
-        <ViewNativeComponent {...processedProps} ref={ref} />
-      );
+    actualView = <ViewNativeComponent {...processedProps} />;
   } else {
     const {
       accessibilityElementsHidden,
@@ -201,7 +198,6 @@ export default component View(
             : importantForAccessibility
         }
         nativeID={id ?? nativeID}
-        ref={ref}
       />
     );
   }
@@ -211,3 +207,8 @@ export default component View(
   }
   return actualView;
 }
+
+export default View as component(
+  ref?: React.RefSetter<React.ElementRef<typeof ViewNativeComponent>>,
+  ...props: ViewProps
+);

packages/react-native/Libraries/Components/View/ViewAccessibility.js

@@ -374,6 +374,13 @@ export type AccessibilityProps = $ReadOnly<{
    */
   'aria-label'?: ?Stringish,
 
+  /**
+   * Defines the order in which descendant elements receive accessibility focus.
+   * The elements in the array represent nativeID values for the respective
+   * descendant elements.
+   */
+  experimental_accessibilityOrder?: ?Array<string>,
+
   /**
    * Indicates to accessibility services to treat UI component like a specific role.
    */

packages/react-native/Libraries/Components/View/ViewPropTypes.d.ts

@@ -21,9 +21,6 @@ import {
 import {Touchable} from '../Touchable/Touchable';
 import {AccessibilityProps} from './ViewAccessibility';
 
-/**
- * @deprecated These properties are not implemented natively.
- */
 export interface TVViewPropsIOS {
   /**
    * *(Apple TV only)* When set to true, this view will be focusable
@@ -37,7 +34,6 @@ export interface TVViewPropsIOS {
    * *(Apple TV only)* May be set to true to force the Apple TV focus engine to move focus to this view.
    *
    * @platform ios
-   * @deprecated Use `focusable` instead
    */
   hasTVPreferredFocus?: boolean | undefined;
 

packages/react-native/Libraries/Components/View/ViewPropTypes.js

@@ -280,7 +280,6 @@ export type ViewPropsAndroid = $ReadOnly<{
    * Whether to force the Android TV focus engine to move focus to this view.
    *
    * @platform android
-   * @deprecated Use `focusable` instead
    */
   hasTVPreferredFocus?: ?boolean,
 
@@ -490,13 +489,6 @@ type ViewBaseProps = $ReadOnly<{
    * See https://reactnative.dev/docs/view#removeclippedsubviews
    */
   removeClippedSubviews?: ?boolean,
-
-  /**
-   * Defines the order in which descendant elements receive accessibility focus.
-   * The elements in the array represent nativeID values for the respective
-   * descendant elements.
-   */
-  experimental_accessibilityOrder?: ?Array<string>,
 }>;
 
 export type ViewProps = $ReadOnly<{

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

@@ -169,20 +169,6 @@ describe('<View>', () => {
     });
   });
 
-  describe('transform style', () => {
-    it('causes view to be unflattened', () => {
-      const root = Fantom.createRoot();
-
-      Fantom.runTask(() => {
-        root.render(<View style={{transform: [{translateX: 10}]}} />);
-      });
-
-      expect(root.getRenderedOutput({props: ['transform']}).toJSX()).toEqual(
-        <rn-view transform='[{"translateX": 10.000000}]' />,
-      );
-    });
-  });
-
   describe('props', () => {
     describe('pointerEvents', () => {
       it('auto does not propagate to the mounting layer, it is the default', () => {

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

@@ -31,8 +31,8 @@ describe('<Button>', () => {
             .toJSX(),
         ).toEqual(
           // Upper case on Android (also used by Fantom)
-          <rn-view backgroundColor="rgba(33, 150, 243, 1)">
-            <rn-paragraph foregroundColor="rgba(255, 255, 255, 1)">
+          <rn-view backgroundColor="rgba(33, 150, 243, 255)">
+            <rn-paragraph foregroundColor="rgba(255, 255, 255, 255)">
               HELLO
             </rn-paragraph>
           </rn-view>,
@@ -53,8 +53,8 @@ describe('<Button>', () => {
             .getRenderedOutput({props: ['foregroundColor', 'backgroundColor']})
             .toJSX(),
         ).toEqual(
-          <rn-view backgroundColor="rgba(0, 0, 255, 1)">
-            <rn-paragraph foregroundColor="rgba(255, 255, 255, 1)">
+          <rn-view backgroundColor="rgba(0, 0, 255, 255)">
+            <rn-paragraph foregroundColor="rgba(255, 255, 255, 255)">
               HELLO
             </rn-paragraph>
           </rn-view>,
@@ -99,8 +99,8 @@ describe('<Button>', () => {
             .getRenderedOutput({props: ['foregroundColor', 'backgroundColor']})
             .toJSX(),
         ).toEqual(
-          <rn-view backgroundColor="rgba(223, 223, 223, 1)">
-            <rn-paragraph foregroundColor="rgba(161, 161, 161, 1)">
+          <rn-view backgroundColor="rgba(223, 223, 223, 255)">
+            <rn-paragraph foregroundColor="rgba(161, 161, 161, 255)">
               HELLO
             </rn-paragraph>
           </rn-view>,
@@ -181,8 +181,8 @@ describe('<Button>', () => {
             .getRenderedOutput({props: ['foregroundColor', 'backgroundColor']})
             .toJSX(),
         ).toEqual(
-          <rn-view backgroundColor="rgba(33, 150, 243, 1)">
-            <rn-paragraph foregroundColor="rgba(255, 255, 255, 1)">
+          <rn-view backgroundColor="rgba(33, 150, 243, 255)">
+            <rn-paragraph foregroundColor="rgba(255, 255, 255, 255)">
               HELLO
             </rn-paragraph>
           </rn-view>,
@@ -223,8 +223,8 @@ describe('<Button>', () => {
             .getRenderedOutput({props: ['foregroundColor', 'backgroundColor']})
             .toJSX(),
         ).toEqual(
-          <rn-view backgroundColor="rgba(223, 223, 223, 1)">
-            <rn-paragraph foregroundColor="rgba(161, 161, 161, 1)">
+          <rn-view backgroundColor="rgba(223, 223, 223, 255)">
+            <rn-paragraph foregroundColor="rgba(161, 161, 161, 255)">
               HELLO
             </rn-paragraph>
           </rn-view>,

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

@@ -105,7 +105,7 @@ function reportException(
     // we feed back into console.error, to make sure any methods that are
     // monkey patched on top of console.error are called when coming from
     // handleException
-    console.error(e);
+    console.error(data.message);
   }
 
   if (__DEV__) {

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

@@ -133,7 +133,7 @@ function runExceptionsManagerTests() {
         );
         expect(exceptionData.isFatal).toBe(false);
         expect(logToConsoleInReact).toBe(false);
-        expect(console.error).toBeCalledWith(error);
+        expect(console.error).toBeCalledWith(formattedMessage);
       });
 
       test('does not pop frames off the stack with framesToPop', () => {
@@ -163,10 +163,16 @@ function runExceptionsManagerTests() {
           expect(nativeReportException).toBeCalledTimes(1);
           exceptionData = nativeReportException.mock.calls[0][0];
         }
+        const formattedMessage =
+          'Error: ' +
+          error.message +
+          '\n\n' +
+          'This error is located at:' +
+          capturedErrorDefaults.componentStack;
         expect(getLineFromFrame(exceptionData.stack[0])).toBe(
           "const error = new Error('Some error happened');",
         );
-        expect(console.error).toBeCalledWith(error);
+        expect(console.error).toBeCalledWith(formattedMessage);
       });
 
       test('wraps string in an Error and sends to handleException', () => {
@@ -205,13 +211,7 @@ function runExceptionsManagerTests() {
         );
         expect(exceptionData.isFatal).toBe(false);
         expect(logToConsoleInReact).toBe(false);
-        expect(console.error).toBeCalledTimes(1);
-        // $FlowFixMe[prop-missing]
-        expect(console.error.mock.calls[0][0]).toBeInstanceOf(
-          ExceptionsManager.SyntheticError,
-        );
-        // $FlowFixMe[prop-missing]
-        expect(console.error.mock.calls[0][0].toString()).toBe(message);
+        expect(console.error).toBeCalledWith(formattedMessage);
       });
 
       test('reports "Unspecified error" if error is null', () => {
@@ -249,15 +249,7 @@ function runExceptionsManagerTests() {
         );
         expect(exceptionData.isFatal).toBe(false);
         expect(logToConsoleInReact).toBe(false);
-        expect(console.error).toBeCalledTimes(1);
-        // $FlowFixMe[prop-missing]
-        expect(console.error.mock.calls[0][0]).toBeInstanceOf(
-          ExceptionsManager.SyntheticError,
-        );
-        // $FlowFixMe[prop-missing]
-        expect(console.error.mock.calls[0][0].toString()).toBe(
-          'Unspecified error',
-        );
+        expect(console.error).toBeCalledWith(formattedMessage);
       });
 
       test('works with a frozen error object', () => {
@@ -288,7 +280,7 @@ function runExceptionsManagerTests() {
         // No component stack.
         const formattedMessage = 'Error: ' + error.message;
         expect(exceptionData.message).toBe(formattedMessage);
-        expect(console.error).toBeCalledWith(error);
+        expect(console.error).toBeCalledWith(formattedMessage);
       });
 
       test('does not mutate the message', () => {
@@ -320,7 +312,7 @@ function runExceptionsManagerTests() {
           'This error is located at:' +
           capturedErrorDefaults.componentStack;
         expect(exceptionData.message).toBe(formattedMessage);
-        expect(console.error).toBeCalledWith(error);
+        expect(console.error).toBeCalledWith(formattedMessage);
       });
 
       test('can safely process the same error multiple times', () => {
@@ -368,7 +360,7 @@ function runExceptionsManagerTests() {
           );
           expect(exceptionData.isFatal).toBe(false);
           expect(logToConsoleInReact).toBe(false);
-          expect(console.error).toBeCalledWith(error);
+          expect(console.error).toBeCalledWith(formattedMessage);
         }
       });
     });
@@ -672,7 +664,7 @@ function runExceptionsManagerTests() {
         // $FlowFixMe[prop-missing]
         expect(console.error.mock.calls[0]).toHaveLength(1);
         // $FlowFixMe[prop-missing]
-        expect(console.error.mock.calls[0][0]).toBe(error);
+        expect(console.error.mock.calls[0][0]).toBe(formattedMessage);
       });
 
       test('handling a non-fatal Error', () => {
@@ -705,7 +697,7 @@ function runExceptionsManagerTests() {
         // $FlowFixMe[prop-missing]
         expect(console.error.mock.calls[0]).toHaveLength(1);
         // $FlowFixMe[prop-missing]
-        expect(console.error.mock.calls[0][0]).toBe(error);
+        expect(console.error.mock.calls[0][0]).toBe(formattedMessage);
       });
 
       test('handling a thrown string', () => {
@@ -734,11 +726,7 @@ function runExceptionsManagerTests() {
         // $FlowFixMe[prop-missing]
         expect(console.error.mock.calls[0]).toHaveLength(1);
         // $FlowFixMe[prop-missing]
-        expect(console.error.mock.calls[0][0]).toBeInstanceOf(
-          ExceptionsManager.SyntheticError,
-        );
-        // $FlowFixMe[prop-missing]
-        expect(console.error.mock.calls[0][0].toString()).toBe(message);
+        expect(console.error.mock.calls[0]).toEqual([message]);
       });
 
       test('does not pop frames off the stack with framesToPop', () => {
@@ -771,7 +759,9 @@ function runExceptionsManagerTests() {
         // $FlowFixMe[prop-missing]
         expect(console.error.mock.calls[0]).toHaveLength(1);
         // $FlowFixMe[prop-missing]
-        expect(console.error.mock.calls[0][0]).toBe(error);
+        expect(console.error.mock.calls[0]).toEqual([
+          'Error: ' + error.message,
+        ]);
       });
 
       test('logs fatal "warn"-type errors', () => {
@@ -793,17 +783,19 @@ function runExceptionsManagerTests() {
         // $FlowFixMe[prop-missing]
         expect(console.error.mock.calls[0]).toHaveLength(1);
         // $FlowFixMe[prop-missing]
-        expect(console.error.mock.calls[0][0]).toBe(error);
+        expect(console.error.mock.calls[0]).toEqual([
+          'Error: ' + error.message,
+        ]);
       });
     });
 
     describe('unstable_setExceptionDecorator', () => {
-      let mockConsoleError;
+      let mockError;
       beforeEach(() => {
         // NOTE: We initialise a fresh mock every time using spyOn, above.
         // We can't use `console._errorOriginal` for this, because that's a bound
         // (=wrapped) version of the mock and Jest does not approve.
-        mockConsoleError = console.error;
+        mockError = console.error;
         ExceptionsManager.installConsoleErrorReporter();
       });
 
@@ -869,11 +861,15 @@ function runExceptionsManagerTests() {
           ...beforeDecorator,
           message: 'decorated: ' + beforeDecorator.message,
         });
-        expect(mockConsoleError).toBeCalledTimes(2);
+        expect(mockError).toBeCalledTimes(2);
         // $FlowFixMe[prop-missing]
-        expect(mockConsoleError.mock.calls[0][0]).toBe(error);
+        expect(mockError.mock.calls[0][0]).toEqual(
+          'Error: Some error happened',
+        );
         // $FlowFixMe[prop-missing]
-        expect(mockConsoleError.mock.calls[1][0]).toBe(error);
+        expect(mockError.mock.calls[1][0]).toMatch(
+          'decorated: Error: Some error happened',
+        );
       });
 
       test('clearing a decorator', () => {
@@ -897,9 +893,11 @@ function runExceptionsManagerTests() {
           expect(logBoxAddException).not.toBeCalled();
           expect(nativeReportException).toBeCalledTimes(1);
         }
-        expect(mockConsoleError).toBeCalledTimes(1);
+        expect(mockError).toBeCalledTimes(1);
         // $FlowFixMe[prop-missing]
-        expect(mockConsoleError.mock.calls[0][0]).toBe(error);
+        expect(mockError.mock.calls[0][0]).toEqual(
+          'Error: Some error happened',
+        );
       });
 
       test('prevents decorator recursion from error handler', () => {
@@ -930,13 +928,15 @@ function runExceptionsManagerTests() {
             /decorated: .*Some error happened/,
           );
         }
-        expect(mockConsoleError).toBeCalledTimes(2);
+        expect(mockError).toBeCalledTimes(2);
         // $FlowFixMe[prop-missing]
-        expect(mockConsoleError.mock.calls[0][0]).toMatch(
+        expect(mockError.mock.calls[0][0]).toMatch(
           /Logging an error within the decorator/,
         );
         // $FlowFixMe[prop-missing]
-        expect(mockConsoleError.mock.calls[1][0]).toBe(error);
+        expect(mockError.mock.calls[1][0]).toMatch(
+          /decorated: .*Some error happened/,
+        );
       });
 
       test('prevents decorator recursion from console.error', () => {
@@ -974,14 +974,14 @@ function runExceptionsManagerTests() {
             /decorated: .*Some error happened/,
           );
         }
-        expect(mockConsoleError).toBeCalledTimes(2);
+        expect(mockError).toBeCalledTimes(2);
         // console.error calls are chained without exception pre-processing, so decorator doesn't apply
         // $FlowFixMe[prop-missing]
-        expect(mockConsoleError.mock.calls[0][0].toString()).toMatch(
+        expect(mockError.mock.calls[0][0].toString()).toMatch(
           /Error: Some error happened/,
         );
         // $FlowFixMe[prop-missing]
-        expect(mockConsoleError.mock.calls[1][0]).toMatch(
+        expect(mockError.mock.calls[1][0]).toMatch(
           /Logging an error within the decorator/,
         );
       });
@@ -1012,9 +1012,11 @@ function runExceptionsManagerTests() {
             /Error: Some error happened/,
           );
         }
-        expect(mockConsoleError).toBeCalledTimes(1);
+        expect(mockError).toBeCalledTimes(1);
         // $FlowFixMe[prop-missing]
-        expect(mockConsoleError.mock.calls[0][0]).toBe(error);
+        expect(mockError.mock.calls[0][0]).toMatch(
+          /Error: Some error happened/,
+        );
       });
 
       test('can handle throwing decorators recursion when exception is logged', () => {
@@ -1042,9 +1044,9 @@ function runExceptionsManagerTests() {
             /Error: Some error happened/,
           );
         }
-        expect(mockConsoleError).toBeCalledTimes(1);
+        expect(mockError).toBeCalledTimes(1);
         // $FlowFixMe[prop-missing]
-        expect(mockConsoleError.mock.calls[0][0].toString()).toMatch(
+        expect(mockError.mock.calls[0][0].toString()).toMatch(
           /Error: Some error happened/,
         );
       });

packages/react-native/Libraries/EventEmitter/NativeEventEmitter.js

@@ -32,7 +32,7 @@ export type {EventSubscription, EmitterSubscription};
 export type NativeEventSubscription = EventSubscription;
 
 // $FlowFixMe[unclear-type] unclear type of events
-type UnsafeNativeEventObject = Object;
+type UnsafeObject = Object;
 
 /**
  * `NativeEventEmitter` is intended for use by Native Modules to emit events to
@@ -46,8 +46,8 @@ type UnsafeNativeEventObject = Object;
  */
 export default class NativeEventEmitter<
   TEventToArgsMap: $ReadOnly<
-    Record<string, $ReadOnlyArray<UnsafeNativeEventObject>>,
-  > = $ReadOnly<Record<string, $ReadOnlyArray<UnsafeNativeEventObject>>>,
+    Record<string, $ReadOnlyArray<UnsafeObject>>,
+  > = $ReadOnly<Record<string, $ReadOnlyArray<UnsafeObject>>>,
 > implements IEventEmitter<TEventToArgsMap>
 {
   _nativeModule: ?NativeModule;

packages/react-native/Libraries/FBLazyVector/FBLazyVector.podspec

@@ -25,7 +25,7 @@ Pod::Spec.new do |s|
   s.author                 = "Meta Platforms, Inc. and its affiliates"
   s.platforms              = min_supported_versions
   s.source                 = source
-  s.source_files           = podspec_sources("**/*.{c,h,m,mm,cpp}", "**/*.h")
+  s.source_files           = "**/*.{c,h,m,mm,cpp}"
   s.header_dir             = "FBLazyVector"
 
 end

packages/react-native/Libraries/Image/RCTImageURLLoaderWithAttribution.h

@@ -8,10 +8,9 @@
 #import <React/RCTImageLoaderLoggable.h>
 #import <React/RCTImageLoaderProtocol.h>
 #import <React/RCTImageURLLoader.h>
+
 // TODO (T61325135): Remove C++ checks
 #ifdef __cplusplus
-#import <string>
-
 namespace facebook::react {
 
 struct ImageURLLoaderAttribution {

packages/react-native/Libraries/Image/RCTImageUtils.mm

@@ -7,7 +7,7 @@
 
 #import <React/RCTImageUtils.h>
 
-#import <cmath>
+#import <tgmath.h>
 
 #import <ImageIO/ImageIO.h>
 #import <MobileCoreServices/UTCoreTypes.h>

packages/react-native/Libraries/Image/React-RCTImage.podspec

@@ -32,7 +32,7 @@ Pod::Spec.new do |s|
   s.platforms              = min_supported_versions
   s.compiler_flags         = '-Wno-nullability-completeness'
   s.source                 = source
-  s.source_files           = podspec_sources("*.{m,mm}", "**/*.h")
+  s.source_files           = "*.{m,mm}"
   s.preserve_paths         = "package.json", "LICENSE", "LICENSE-docs"
   s.header_dir             = "RCTImage"
   s.pod_target_xcconfig    = {

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

@@ -229,8 +229,7 @@ function _processUpdate() {
  */
 const InteractionManager = (
   ReactNativeFeatureFlags.disableInteractionManager()
-    ? // $FlowFixMe[incompatible-variance]
-      require('./InteractionManagerStub').default
+    ? require('./InteractionManagerStub').default
     : InteractionManagerImpl
 ) as typeof InteractionManagerImpl;
 

packages/react-native/Libraries/LayoutAnimation/LayoutAnimation.js

@@ -45,7 +45,7 @@ type OnAnimationDidFailCallback = () => void;
 let isLayoutAnimationEnabled: boolean =
   ReactNativeFeatureFlags.isLayoutAnimationEnabled();
 
-function setLayoutAnimationEnabled(value: boolean) {
+function setEnabled(value: boolean) {
   isLayoutAnimationEnabled = isLayoutAnimationEnabled;
 }
 
@@ -115,7 +115,7 @@ function configureNext(
   }
 }
 
-function createLayoutAnimation(
+function create(
   duration: number,
   type?: LayoutAnimationType,
   property?: LayoutAnimationProperty,
@@ -129,16 +129,12 @@ function createLayoutAnimation(
 }
 
 const Presets = {
-  easeInEaseOut: (createLayoutAnimation(
+  easeInEaseOut: (create(
     300,
     'easeInEaseOut',
     'opacity',
   ): LayoutAnimationConfig),
-  linear: (createLayoutAnimation(
-    500,
-    'linear',
-    'opacity',
-  ): LayoutAnimationConfig),
+  linear: (create(500, 'linear', 'opacity'): LayoutAnimationConfig),
   spring: ({
     duration: 700,
     create: {
@@ -184,7 +180,7 @@ const LayoutAnimation = {
   /**
    * Helper for creating a config for `configureNext`.
    */
-  create: createLayoutAnimation,
+  create,
   Types: Object.freeze({
     spring: 'spring',
     linear: 'linear',
@@ -212,7 +208,7 @@ const LayoutAnimation = {
   spring: (configureNext.bind(null, Presets.spring): (
     onAnimationDidEnd?: OnAnimationDidEndCallback,
   ) => void),
-  setEnabled: setLayoutAnimationEnabled,
+  setEnabled,
 };
 
 export default LayoutAnimation;

packages/react-native/Libraries/LinkingIOS/React-RCTLinking.podspec

@@ -31,7 +31,7 @@ Pod::Spec.new do |s|
   s.platforms              = min_supported_versions
   s.compiler_flags         = '-Wno-nullability-completeness'
   s.source                 = source
-  s.source_files           = podspec_sources("*.{m,mm}", "")
+  s.source_files           = "*.{m,mm}"
   s.preserve_paths         = "package.json", "LICENSE", "LICENSE-docs"
   s.header_dir             = "RCTLinking"
   s.pod_target_xcconfig    = {

packages/react-native/Libraries/Lists/FlatList.js

@@ -15,7 +15,6 @@ import type {
   ListRenderItemInfo,
   ViewabilityConfigCallbackPair,
   ViewToken,
-  VirtualizedListProps,
 } from '@react-native/virtualized-lists';
 
 import * as ReactNativeFeatureFlags from '../../src/private/featureflags/ReactNativeFeatureFlags';
@@ -182,6 +181,8 @@ type FlatListBaseProps<ItemT> = {
   ...OptionalProps<ItemT>,
 };
 
+type VirtualizedListProps = React.ElementConfig<typeof VirtualizedList>;
+
 export type FlatListProps<ItemT> = {
   ...Omit<
     VirtualizedListProps,

packages/react-native/Libraries/LogBox/Data/__tests__/parseLogBoxLog-test.js

@@ -9,8 +9,8 @@
  */
 
 'use strict';
+
 import type {StackFrame} from '../../../Core/NativeExceptionsManager';
-import type {ExtendedExceptionData} from '../parseLogBoxLog';
 
 const {
   parseLogBoxException,
@@ -296,7 +296,7 @@ describe('parseLogBoxLog', () => {
   });
 
   it('parses a babel transform syntax error', () => {
-    const error: ExtendedExceptionData = {
+    const error = {
       message: `
 
   197 | });
@@ -344,7 +344,7 @@ describe('parseLogBoxLog', () => {
   });
 
   it('parses an invalid require syntax error', () => {
-    const error: ExtendedExceptionData = {
+    const error = {
       message: `Unable to resolve module \`ListCellx\` from /path/to/file.js: ListCellx could not be found within the project.
 
 If you are sure the module exists, try these steps:
@@ -414,7 +414,7 @@ If you are sure the module exists, try these steps:
   });
 
   it('parses a reference error', () => {
-    const error: ExtendedExceptionData = {
+    const error = {
       message: `
 
   197 | });
@@ -462,7 +462,7 @@ If you are sure the module exists, try these steps:
   });
 
   it('parses a babel codeframe error', () => {
-    const error: ExtendedExceptionData = {
+    const error = {
       message: `TransformError RKJSModules/Apps/CrashReact/CrashReactApp.js: /path/to/RKJSModules/Apps/CrashReact/CrashReactApp.js: The first argument to \`fbRemoteAsset\` is "null_state_glyphs", but the requested asset is missing from the local metadata. Either the asset does not exist or the metadata is not up-to-date.
 
 Please follow the instructions at: fburl.com/rn-remote-assets
@@ -514,7 +514,7 @@ Please follow the instructions at: fburl.com/rn-remote-assets`,
   });
 
   it('parses a babel codeframe error with ansi', () => {
-    const error: ExtendedExceptionData = {
+    const error = {
       message: `TransformError RKJSModules/Apps/CrashReact/CrashReactApp.js: /path/to/RKJSModules/Apps/CrashReact/CrashReactApp.js: The first argument to \`fbRemoteAsset\` is "null_state_glyphs", but the requested asset is missing from the local metadata. Either the asset does not exist or the metadata is not up-to-date.
 
 Please follow the instructions at: fburl.com/rn-remote-assets

packages/react-native/Libraries/Modal/Modal.d.ts

@@ -35,9 +35,9 @@ export interface ModalBaseProps {
    */
   visible?: boolean | undefined;
   /**
-   * The `onRequestClose` callback is called when the user taps the hardware back button on Android, dismisses the sheet using a gesture on iOS (when `allowSwipeDismissal` is set to true) or the menu button on Apple TV.
+   * The `onRequestClose` callback is called when the user taps the hardware back button on Android or the menu button on Apple TV.
    *
-   * This is required on iOS and Android.
+   * This is required on Apple TV and Android.
    */
   onRequestClose?: ((event: NativeSyntheticEvent<any>) => void) | undefined;
   /**
@@ -89,12 +89,6 @@ export interface ModalPropsIOS {
   onOrientationChange?:
     | ((event: NativeSyntheticEvent<any>) => void)
     | undefined;
-
-  /**
-   * Controls whether the modal can be dismissed by swiping down on iOS.
-   * This requires you to implement the `onRequestClose` prop to handle the dismissal.
-   */
-  allowSwipeDismissal?: boolean | undefined;
 }
 
 export interface ModalPropsAndroid {

packages/react-native/Libraries/Modal/Modal.js

@@ -86,9 +86,9 @@ export type ModalBaseProps = {
    */
   visible?: ?boolean,
   /**
-   * The `onRequestClose` callback is called when the user taps the hardware back button on Android, dismisses the sheet using a gesture on iOS (when `allowSwipeDismissal` is set to true) or the menu button on Apple TV.
+   * The `onRequestClose` callback is called when the user taps the hardware back button on Android or the menu button on Apple TV.
    *
-   * This is required on iOS and Android.
+   * This is required on Apple TV and Android.
    */
   // onRequestClose?: (event: NativeSyntheticEvent<any>) => void;
   onRequestClose?: ?DirectEventHandler<null>,
@@ -147,12 +147,6 @@ export type ModalPropsIOS = {
   //   | ((event: NativeSyntheticEvent<any>) => void)
   //   | undefined;
   onOrientationChange?: ?DirectEventHandler<OrientationChangeEvent>,
-
-  /**
-   * Controls whether the modal can be dismissed by swiping down on iOS.
-   * This requires you to implement the `onRequestClose` prop to handle the dismissal.
-   */
-  allowSwipeDismissal?: ?boolean,
 };
 
 export type ModalPropsAndroid = {
@@ -198,16 +192,6 @@ function confirmProps(props: ModalProps) {
         'Modal with translucent navigation bar and without translucent status bar is not supported.',
       );
     }
-
-    if (
-      Platform.OS === 'ios' &&
-      props.allowSwipeDismissal === true &&
-      !props.onRequestClose
-    ) {
-      console.warn(
-        'Modal requires the onRequestClose prop when used with `allowSwipeDismissal`. This is necessary to prevent state corruption.',
-      );
-    }
   }
 }
 
@@ -343,7 +327,6 @@ class Modal extends React.Component<ModalProps, ModalState> {
         onStartShouldSetResponder={this._shouldSetResponder}
         supportedOrientations={this.props.supportedOrientations}
         onOrientationChange={this.props.onOrientationChange}
-        allowSwipeDismissal={this.props.allowSwipeDismissal}
         testID={this.props.testID}>
         <VirtualizedListContextResetter>
           <ScrollView.Context.Provider value={null}>

packages/react-native/Libraries/NativeAnimation/React-RCTAnimation.podspec

@@ -30,7 +30,7 @@ Pod::Spec.new do |s|
   s.platforms              = min_supported_versions
   s.compiler_flags         = '-Wno-nullability-completeness'
   s.source                 = source
-  s.source_files           = podspec_sources("**/*.{h,m,mm}", "**/*.h")
+  s.source_files           = "**/*.{h,m,mm}"
   s.preserve_paths         = "package.json", "LICENSE", "LICENSE-docs"
   s.header_dir             = "RCTAnimation"
   s.pod_target_xcconfig    = {

packages/react-native/Libraries/Network/React-RCTNetwork.podspec

@@ -30,7 +30,7 @@ Pod::Spec.new do |s|
   s.platforms              = min_supported_versions
   s.compiler_flags         = '-Wno-nullability-completeness'
   s.source                 = source
-  s.source_files           = podspec_sources("*.{m,mm}", "")
+  s.source_files           = "*.{m,mm}"
   s.preserve_paths         = "package.json", "LICENSE", "LICENSE-docs"
   s.header_dir             = "RCTNetwork"
   s.pod_target_xcconfig    = {

packages/react-native/Libraries/PermissionsAndroid/PermissionsAndroid.js

@@ -130,7 +130,7 @@ const PERMISSIONS = Object.freeze({
  *
  * See https://reactnative.dev/docs/permissionsandroid
  */
-class PermissionsAndroidImpl {
+class PermissionsAndroid {
   PERMISSIONS: PermissionsType = PERMISSIONS;
   RESULTS: $ReadOnly<{
     DENIED: 'denied',
@@ -297,6 +297,5 @@ class PermissionsAndroidImpl {
   }
 }
 
-const PermissionsAndroidInstance: PermissionsAndroidImpl =
-  new PermissionsAndroidImpl();
+const PermissionsAndroidInstance: PermissionsAndroid = new PermissionsAndroid();
 export default PermissionsAndroidInstance;

packages/react-native/Libraries/ReactNative/AppRegistry.flow.js

@@ -13,8 +13,8 @@ import type {RootTag} from '../Types/RootTagTypes';
 import type {IPerformanceLogger} from '../Utilities/createPerformanceLogger';
 import type {DisplayModeType} from './DisplayMode';
 
-type HeadlessTask = (taskData: any) => Promise<void>;
-export type TaskProvider = () => HeadlessTask;
+type Task = (taskData: any) => Promise<void>;
+export type TaskProvider = () => Task;
 
 export type ComponentProvider = () => React.ComponentType<any>;
 export type ComponentProviderInstrumentationHook = (

packages/react-native/Libraries/ReactNative/ReactFabricPublicInstance/ReactNativeAttributePayload.js

@@ -61,7 +61,7 @@ function restoreDeletedValuesInNestedArray(
   } else if (node && removedKeyCount > 0) {
     const obj = node;
     for (const propKey in removedKeys) {
-      // $FlowFixMe[incompatible-use] removedKeys is always non-null
+      // $FlowFixMe[incompatible-use] found when upgrading Flow
       if (!removedKeys[propKey]) {
         continue;
       }
@@ -133,12 +133,12 @@ function diffNestedArrayProperty(
     );
   }
   for (; i < nextArray.length; i++) {
-    // Add all remaining properties
-    const nextProp = nextArray[i];
-    if (!nextProp) {
-      continue;
-    }
-    updatePayload = addNestedProperty(updatePayload, nextProp, validAttributes);
+    // Add all remaining properties.
+    updatePayload = addNestedProperty(
+      updatePayload,
+      nextArray[i],
+      validAttributes,
+    );
   }
   return updatePayload;
 }
@@ -183,7 +183,9 @@ function diffNestedProperty(
   if (Array.isArray(prevProp)) {
     return diffProperties(
       updatePayload,
+      // $FlowFixMe - We know that this is always an object when the input is.
       flattenStyle(prevProp),
+      // $FlowFixMe - We know that this isn't an array because of above flow.
       nextProp,
       validAttributes,
     );
@@ -192,11 +194,43 @@ function diffNestedProperty(
   return diffProperties(
     updatePayload,
     prevProp,
+    // $FlowFixMe - We know that this is always an object when the input is.
     flattenStyle(nextProp),
     validAttributes,
   );
 }
 
+/**
+ * addNestedProperty takes a single set of props and valid attribute
+ * attribute configurations. It processes each prop and adds it to the
+ * updatePayload.
+ */
+function addNestedProperty(
+  updatePayload: null | Object,
+  nextProp: NestedNode,
+  validAttributes: AttributeConfiguration,
+): $FlowFixMe {
+  if (!nextProp) {
+    return updatePayload;
+  }
+
+  if (!Array.isArray(nextProp)) {
+    // Add each property of the leaf.
+    return addProperties(updatePayload, nextProp, validAttributes);
+  }
+
+  for (let i = 0; i < nextProp.length; i++) {
+    // Add all the properties of the array.
+    updatePayload = addNestedProperty(
+      updatePayload,
+      nextProp[i],
+      validAttributes,
+    );
+  }
+
+  return updatePayload;
+}
+
 /**
  * clearNestedProperty takes a single set of props and valid attributes. It
  * adds a null sentinel to the updatePayload, for each prop key.
@@ -251,19 +285,14 @@ function diffProperties(
     prevProp = prevProps[propKey];
     nextProp = nextProps[propKey];
 
+    // functions are converted to booleans as markers that the associated
+    // events should be sent from native.
     if (typeof nextProp === 'function') {
-      const attributeConfigHasProcess =
-        typeof attributeConfig === 'object' &&
-        typeof attributeConfig.process === 'function';
-      if (!attributeConfigHasProcess) {
-        // functions are converted to booleans as markers that the associated
-        // events should be sent from native.
-        nextProp = (true: any);
-        // If nextProp is not a function, then don't bother changing prevProp
-        // since nextProp will win and go into the updatePayload regardless.
-        if (typeof prevProp === 'function') {
-          prevProp = (true: any);
-        }
+      nextProp = (true: any);
+      // If nextProp is not a function, then don't bother changing prevProp
+      // since nextProp will win and go into the updatePayload regardless.
+      if (typeof prevProp === 'function') {
+        prevProp = (true: any);
       }
     }
 
@@ -413,69 +442,16 @@ function diffProperties(
   return updatePayload;
 }
 
-function addNestedProperty(
-  payload: null | Object,
+/**
+ * addProperties adds all the valid props to the payload after being processed.
+ */
+function addProperties(
+  updatePayload: null | Object,
   props: Object,
   validAttributes: AttributeConfiguration,
 ): null | Object {
-  // Flatten nested style props.
-  if (Array.isArray(props)) {
-    for (let i = 0; i < props.length; i++) {
-      payload = addNestedProperty(payload, props[i], validAttributes);
-    }
-    return payload;
-  }
-
-  for (const propKey in props) {
-    const prop = props[propKey];
-
-    const attributeConfig = ((validAttributes[
-      propKey
-    ]: any): AttributeConfiguration);
-
-    if (attributeConfig == null) {
-      continue;
-    }
-
-    let newValue;
-
-    if (prop === undefined) {
-      // Discard the prop if it was previously defined.
-      if (payload && payload[propKey] !== undefined) {
-        newValue = null;
-      } else {
-        continue;
-      }
-    } else if (typeof attributeConfig === 'object') {
-      if (typeof attributeConfig.process === 'function') {
-        // An atomic prop with custom processing.
-        newValue = attributeConfig.process(prop);
-      } else if (typeof attributeConfig.diff === 'function') {
-        // An atomic prop with custom diffing. We don't need to do diffing when adding props.
-        newValue = prop;
-      }
-    } else {
-      if (typeof prop === 'function') {
-        // A function prop. It represents an event handler. Pass it to native as 'true'.
-        newValue = true;
-      } else {
-        // An atomic prop. Doesn't need to be flattened.
-        newValue = prop;
-      }
-    }
-
-    if (newValue !== undefined) {
-      if (!payload) {
-        payload = ({}: {[string]: $FlowFixMe});
-      }
-      payload[propKey] = newValue;
-      continue;
-    }
-
-    payload = addNestedProperty(payload, prop, attributeConfig);
-  }
-
-  return payload;
+  // TODO: Fast path
+  return diffProperties(updatePayload, emptyObject, props, validAttributes);
 }
 
 /**
@@ -487,6 +463,7 @@ function clearProperties(
   prevProps: Object,
   validAttributes: AttributeConfiguration,
 ): null | Object {
+  // TODO: Fast path
   return diffProperties(updatePayload, prevProps, emptyObject, validAttributes);
 }
 
@@ -494,7 +471,11 @@ export function create(
   props: Object,
   validAttributes: AttributeConfiguration,
 ): null | Object {
-  return addNestedProperty(null, props, validAttributes);
+  return addProperties(
+    null, // updatePayload
+    props,
+    validAttributes,
+  );
 }
 
 export function diff(

packages/react-native/Libraries/ReactNative/ReactFabricPublicInstance/__tests__/ReactNativeAttributePayload-test.js

@@ -1,495 +0,0 @@
-/**
- * Copyright (c) Meta Platforms, Inc. and affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- *
- * @flow
- * @format
- */
-
-'use strict';
-
-import type {AttributeConfiguration} from '../../../Renderer/shims/ReactNativeTypes';
-
-const {create, diff} = require('../ReactNativeAttributePayload');
-
-describe('ReactNativeAttributePayload.create', () => {
-  it('should work with simple example', () => {
-    expect(create({b: 2, c: 3}, {a: true, b: true})).toEqual({
-      b: 2,
-    });
-  });
-
-  it('should work with complex example', () => {
-    const validAttributes: AttributeConfiguration = {
-      style: {
-        position: true,
-        zIndex: true,
-        flexGrow: true,
-        flexShrink: true,
-        flexDirection: true,
-        overflow: true,
-        backgroundColor: true,
-      },
-    };
-
-    expect(
-      create(
-        {
-          style: [
-            {
-              flexGrow: 1,
-              flexShrink: 1,
-              flexDirection: 'row',
-              overflow: 'scroll',
-            },
-            [
-              {position: 'relative', zIndex: 2},
-              {flexGrow: 0},
-              {backgroundColor: 'red'},
-            ],
-          ],
-        },
-        validAttributes,
-      ),
-    ).toEqual({
-      flexGrow: 0,
-      flexShrink: 1,
-      flexDirection: 'row',
-      overflow: 'scroll',
-      position: 'relative',
-      zIndex: 2,
-      backgroundColor: 'red',
-    });
-  });
-
-  it('should nullify previously defined style prop that is subsequently set to null or undefined', () => {
-    expect(
-      create({style: [{a: 0}, {a: undefined}]}, {style: {a: true}}),
-    ).toEqual({a: null});
-    expect(create({style: [{a: 0}, {a: null}]}, {style: {a: true}})).toEqual({
-      a: null,
-    });
-  });
-
-  it('should ignore non-style fields that are set to undefined', () => {
-    expect(create({}, {a: true})).toEqual(null);
-    expect(create({a: undefined}, {a: true})).toEqual(null);
-    expect(create({a: undefined, b: undefined}, {a: true, b: true})).toEqual(
-      null,
-    );
-    expect(
-      create({a: undefined, b: undefined, c: 1}, {a: true, b: true}),
-    ).toEqual(null);
-    expect(
-      create({a: undefined, b: undefined, c: 1}, {a: true, b: true, c: true}),
-    ).toEqual({c: 1});
-    expect(
-      create({a: 1, b: undefined, c: 2}, {a: true, b: true, c: true}),
-    ).toEqual({a: 1, c: 2});
-  });
-
-  it('should ignore invalid fields', () => {
-    expect(create({b: 2}, {})).toEqual(null);
-  });
-
-  it('should not use the diff attribute', () => {
-    const diffA = jest.fn();
-    expect(create({a: [2]}, {a: {diff: diffA}})).toEqual({a: [2]});
-    expect(diffA).not.toBeCalled();
-  });
-
-  it('should use the process attribute', () => {
-    const processA = jest.fn(a => a + 1);
-    expect(create({a: 2}, {a: {process: processA}})).toEqual({a: 3});
-    expect(processA).toBeCalledWith(2);
-  });
-
-  it('should use the process attribute for functions as well', () => {
-    const process = (x: Object) => x;
-    const nextFunction = () => {};
-    expect(create({a: nextFunction}, {a: {process}})).toEqual({
-      a: nextFunction,
-    });
-  });
-
-  it('should work with undefined styles', () => {
-    expect(create({style: undefined}, {style: {b: true}})).toEqual(null);
-    expect(create({style: {a: '#ffffff', b: 1}}, {style: {b: true}})).toEqual({
-      b: 1,
-    });
-  });
-
-  it('should flatten nested styles and predefined styles', () => {
-    const validStyleAttribute: AttributeConfiguration = {
-      style: {foo: true, bar: true},
-    };
-    expect(create({style: [{foo: 1}, {bar: 2}]}, validStyleAttribute)).toEqual({
-      foo: 1,
-      bar: 2,
-    });
-    expect(create({}, validStyleAttribute)).toEqual(null);
-    const barStyle = {
-      bar: 3,
-    };
-    expect(
-      create({style: [[{foo: 1}, {foo: 2}], barStyle]}, validStyleAttribute),
-    ).toEqual({foo: 2, bar: 3});
-  });
-
-  it('should not flatten nested props if attribute config is a primitive or only has diff/process', () => {
-    expect(create({a: {foo: 1, bar: 2}}, {a: true})).toEqual({
-      a: {foo: 1, bar: 2},
-    });
-    expect(create({a: [{foo: 1}, {bar: 2}]}, {a: true})).toEqual({
-      a: [{foo: 1}, {bar: 2}],
-    });
-    expect(create({a: {foo: 1, bar: 2}}, {a: {diff: a => a}})).toEqual({
-      a: {foo: 1, bar: 2},
-    });
-    expect(
-      create({a: [{foo: 1}, {bar: 2}]}, {a: {diff: a => a, process: a => a}}),
-    ).toEqual({a: [{foo: 1}, {bar: 2}]});
-  });
-
-  it('handles attributes defined multiple times', () => {
-    const validAttributes: AttributeConfiguration = {
-      foo: true,
-      style: {foo: true},
-    };
-    expect(create({foo: 4, style: {foo: 2}}, validAttributes)).toEqual({
-      foo: 2,
-    });
-    expect(create({style: {foo: 2}}, validAttributes)).toEqual({
-      foo: 2,
-    });
-    expect(create({style: {foo: 2}, foo: 4}, validAttributes)).toEqual({
-      foo: 4,
-    });
-    expect(create({foo: 4, style: {foo: null}}, validAttributes)).toEqual({
-      foo: null, // this should ideally be null.
-    });
-    expect(
-      create({foo: 4, style: [{foo: null}, {foo: 5}]}, validAttributes),
-    ).toEqual({
-      foo: 5,
-    });
-  });
-
-  // Function properties are just markers to native that events should be sent.
-  it('should convert functions to booleans', () => {
-    expect(
-      create(
-        {
-          a: function () {
-            return 9;
-          },
-          b: function () {
-            return 3;
-          },
-        },
-        {a: true, b: true},
-      ),
-    ).toEqual({a: true, b: true});
-  });
-});
-
-describe('ReactNativeAttributePayload.diff', () => {
-  it('should work with simple example', () => {
-    expect(diff({a: 1, c: 3}, {b: 2, c: 3}, {a: true, b: true})).toEqual({
-      a: null,
-      b: 2,
-    });
-  });
-
-  it('should skip fields that are equal', () => {
-    expect(
-      diff(
-        {a: 1, b: 'two', c: true, d: false, e: undefined, f: 0},
-        {a: 1, b: 'two', c: true, d: false, e: undefined, f: 0},
-        {a: true, b: true, c: true, d: true, e: true, f: true},
-      ),
-    ).toEqual(null);
-  });
-
-  it('should remove fields', () => {
-    expect(diff({a: 1}, {}, {a: true})).toEqual({a: null});
-  });
-
-  it('should remove fields that are set to undefined', () => {
-    expect(diff({a: 1}, {a: undefined}, {a: true})).toEqual({a: null});
-  });
-
-  it('should ignore invalid fields', () => {
-    expect(diff({a: 1}, {b: 2}, {})).toEqual(null);
-  });
-
-  it('should use the diff attribute', () => {
-    const diffA = jest.fn((a, b) => true);
-    const diffB = jest.fn((a, b) => false);
-    expect(
-      diff(
-        {a: [1], b: [3]},
-        {a: [2], b: [4]},
-        {a: {diff: diffA}, b: {diff: diffB}},
-      ),
-    ).toEqual({a: [2]});
-    expect(diffA).toBeCalledWith([1], [2]);
-    expect(diffB).toBeCalledWith([3], [4]);
-  });
-
-  it('should not use the diff attribute on addition/removal', () => {
-    const diffA = jest.fn();
-    const diffB = jest.fn();
-    expect(
-      diff({a: [1]}, {b: [2]}, {a: {diff: diffA}, b: {diff: diffB}}),
-    ).toEqual({a: null, b: [2]});
-    expect(diffA).not.toBeCalled();
-    expect(diffB).not.toBeCalled();
-  });
-
-  it('should do deep diffs of Objects by default', () => {
-    expect(
-      diff(
-        {a: [1], b: {k: [3, 4]}, c: {k: [4, 4]}},
-        {a: [2], b: {k: [3, 4]}, c: {k: [4, 5]}},
-        {a: true, b: true, c: true},
-      ),
-    ).toEqual({a: [2], c: {k: [4, 5]}});
-  });
-
-  it('should work with undefined styles', () => {
-    expect(
-      diff(
-        {style: {a: '#ffffff', b: 1}},
-        {style: undefined},
-        {style: {b: true}},
-      ),
-    ).toEqual({b: null});
-    expect(
-      diff(
-        {style: undefined},
-        {style: {a: '#ffffff', b: 1}},
-        {style: {b: true}},
-      ),
-    ).toEqual({b: 1});
-    expect(
-      diff({style: undefined}, {style: undefined}, {style: {b: true}}),
-    ).toEqual(null);
-  });
-
-  it('should work with empty styles', () => {
-    const validAttributes: AttributeConfiguration = {a: true, b: true};
-    expect(diff({a: 1, c: 3}, {}, validAttributes)).toEqual({a: null});
-    expect(diff({}, {a: 1, c: 3}, validAttributes)).toEqual({a: 1});
-    expect(diff({}, {}, validAttributes)).toEqual(null);
-  });
-
-  it('should flatten nested styles and predefined styles', () => {
-    const validStyleAttribute: AttributeConfiguration = {
-      style: {foo: true, bar: true},
-    };
-
-    expect(
-      diff({}, {style: [{foo: 1}, {bar: 2}]}, validStyleAttribute),
-    ).toEqual({foo: 1, bar: 2});
-
-    expect(
-      diff({style: [{foo: 1}, {bar: 2}]}, {}, validStyleAttribute),
-    ).toEqual({foo: null, bar: null});
-
-    const barStyle = {
-      bar: 3,
-    };
-
-    expect(
-      diff({}, {style: [[{foo: 1}, {foo: 2}], barStyle]}, validStyleAttribute),
-    ).toEqual({foo: 2, bar: 3});
-  });
-
-  it('should reset a value to a previous if it is removed', () => {
-    const validStyleAttribute: AttributeConfiguration = {
-      style: {foo: true, bar: true},
-    };
-
-    expect(
-      diff(
-        {style: [{foo: 1}, {foo: 3}]},
-        {style: [{foo: 1}, {bar: 2}]},
-        validStyleAttribute,
-      ),
-    ).toEqual({foo: 1, bar: 2});
-  });
-
-  it('should not clear removed props if they are still in another slot', () => {
-    const validStyleAttribute: AttributeConfiguration = {
-      style: {foo: true, bar: true},
-    };
-
-    expect(
-      diff(
-        {style: [{}, {foo: 3, bar: 2}]},
-        {style: [{foo: 3}, {bar: 2}]},
-        validStyleAttribute,
-      ),
-    ).toEqual({foo: 3}); // this should ideally be null. heuristic tradeoff.
-
-    expect(
-      diff(
-        {style: [{}, {foo: 3, bar: 2}]},
-        {style: [{foo: 1, bar: 1}, {bar: 2}]},
-        validStyleAttribute,
-      ),
-    ).toEqual({bar: 2, foo: 1});
-  });
-
-  it('should clear a prop if a later style is explicit null/undefined', () => {
-    const validStyleAttribute: AttributeConfiguration = {
-      style: {foo: true, bar: true},
-    };
-    expect(
-      diff(
-        {style: [{}, {foo: 3, bar: 2}]},
-        {style: [{foo: 1}, {bar: 2, foo: null}]},
-        validStyleAttribute,
-      ),
-    ).toEqual({foo: null});
-
-    expect(
-      diff(
-        {style: [{foo: 3}, {foo: null, bar: 2}]},
-        {style: [{foo: null}, {bar: 2}]},
-        validStyleAttribute,
-      ),
-    ).toEqual({foo: null});
-
-    expect(
-      diff(
-        {style: [{foo: 1}, {foo: null}]},
-        {style: [{foo: 2}, {foo: null}]},
-        validStyleAttribute,
-      ),
-    ).toEqual({foo: null}); // this should ideally be null. heuristic.
-
-    // Test the same case with object equality because an early bailout doesn't
-    // work in this case.
-    const fooObj = {foo: 3};
-    expect(
-      diff(
-        {style: [{foo: 1}, fooObj]},
-        {style: [{foo: 2}, fooObj]},
-        validStyleAttribute,
-      ),
-    ).toEqual({foo: 3}); // this should ideally be null. heuristic.
-
-    expect(
-      diff(
-        {style: [{foo: 1}, {foo: 3}]},
-        {style: [{foo: 2}, {foo: undefined}]},
-        validStyleAttribute,
-      ),
-    ).toEqual({foo: null}); // this should ideally be null. heuristic.
-  });
-
-  it('handles attributes defined multiple times', () => {
-    const validAttributes: AttributeConfiguration = {
-      foo: true,
-      style: {foo: true},
-    };
-    expect(diff({}, {foo: 4, style: {foo: 2}}, validAttributes)).toEqual({
-      foo: 2,
-    });
-    expect(diff({foo: 4}, {style: {foo: 2}}, validAttributes)).toEqual({
-      foo: 2,
-    });
-    expect(diff({style: {foo: 2}}, {foo: 4}, validAttributes)).toEqual({
-      foo: 4,
-    });
-  });
-
-  // Function properties are just markers to native that events should be sent.
-  it('should convert functions to booleans', () => {
-    // Note that if the property changes from one function to another, we don't
-    // need to send an update.
-    expect(
-      diff(
-        {
-          a: function () {
-            return 1;
-          },
-          b: function () {
-            return 2;
-          },
-          c: 3,
-        },
-        {
-          b: function () {
-            return 9;
-          },
-          c: function () {
-            return 3;
-          },
-        },
-        {a: true, b: true, c: true},
-      ),
-    ).toEqual({a: null, c: true});
-  });
-
-  it('should skip changed functions', () => {
-    expect(
-      diff(
-        {
-          a: function () {
-            return 1;
-          },
-        },
-        {
-          a: function () {
-            return 9;
-          },
-        },
-        {a: true},
-      ),
-    ).toEqual(null);
-  });
-
-  it('should skip deeply-nested changed functions', () => {
-    expect(
-      diff(
-        {
-          wrapper: {
-            a: function () {
-              return 1;
-            },
-          },
-        },
-        {
-          wrapper: {
-            a: function () {
-              return 9;
-            },
-          },
-        },
-        {wrapper: true},
-      ),
-    ).toEqual(null);
-  });
-
-  it('should use the process function config when prop is a function', () => {
-    const process = jest.fn(a => a);
-    const nextFunction = function () {};
-    expect(
-      diff(
-        {
-          a: function () {},
-        },
-        {
-          a: nextFunction,
-        },
-        {a: {process}},
-      ),
-    ).toEqual({a: nextFunction});
-    expect(process).toBeCalled();
-  });
-});

packages/react-native/Libraries/Renderer/shims/ReactNativeTypes.js

@@ -7,7 +7,7 @@
  * @noformat
  * @nolint
  * @flow strict
- * @generated SignedSource<<6166de7ecbfb5d83e56c11a3b6cde9ba>>
+ * @generated SignedSource<<4216c04f5a8c40a833b0146588fab5fa>>
  */
 
 import type {
@@ -35,6 +35,15 @@ export type AttributeType<T, V> =
 export type AnyAttributeType = AttributeType<$FlowFixMe, $FlowFixMe>;
 
 export type AttributeConfiguration = $ReadOnly<{
+  [propName: string]: AnyAttributeType,
+  style: $ReadOnly<{
+    [propName: string]: AnyAttributeType,
+    ...
+  }>,
+  ...
+}>;
+
+export type PartialAttributeConfiguration = $ReadOnly<{
   [propName: string]: AnyAttributeType,
   style?: $ReadOnly<{
     [propName: string]: AnyAttributeType,
@@ -75,7 +84,7 @@ export type PartialViewConfig = $ReadOnly<{
   directEventTypes?: ViewConfig['directEventTypes'],
   supportsRawText?: boolean,
   uiViewClassName: string,
-  validAttributes?: AttributeConfiguration,
+  validAttributes?: PartialAttributeConfiguration,
 }>;
 
 type InspectorDataProps = $ReadOnly<{

packages/react-native/Libraries/Required/RCTRequired.podspec

@@ -25,6 +25,6 @@ Pod::Spec.new do |s|
   s.author                 = "Meta Platforms, Inc. and its affiliates"
   s.platforms              = min_supported_versions
   s.source                 = source
-  s.source_files           = podspec_sources("**/*.{c,h,m,mm,cpp}", "**/*.h")
+  s.source_files           = "**/*.{c,h,m,mm,cpp}"
   s.header_dir             = "RCTRequired"
 end

packages/react-native/Libraries/Settings/React-RCTSettings.podspec

@@ -31,7 +31,7 @@ Pod::Spec.new do |s|
   s.platforms              = min_supported_versions
   s.compiler_flags         = '-Wno-nullability-completeness'
   s.source                 = source
-  s.source_files           = podspec_sources("*.{m,mm}", "**/*.h")
+  s.source_files           = "*.{m,mm}"
   s.preserve_paths         = "package.json", "LICENSE", "LICENSE-docs"
   s.header_dir             = "RCTSettings"
   s.pod_target_xcconfig    = {

packages/react-native/Libraries/StyleSheet/__tests__/processBackgroundImage-test.js

@@ -8,8 +8,6 @@
  * @format
  */
 
-import type {BackgroundImageValue} from '../StyleSheetTypes';
-
 import processBackgroundImage from '../processBackgroundImage';
 
 const {OS} = require('../../Utilities/Platform').default;
@@ -123,7 +121,7 @@ describe('processBackgroundImage', () => {
   });
 
   it('should process a linear gradient object style with case-insensitive direction keyword', () => {
-    const input: $ReadOnlyArray<BackgroundImageValue> | string = [
+    const input = [
       {
         type: 'linear-gradient' as const,
         direction: 'To Bottom',
@@ -140,7 +138,7 @@ describe('processBackgroundImage', () => {
   });
 
   it('should process a linear gradient object style with case-insensitive angle', () => {
-    const input: $ReadOnlyArray<BackgroundImageValue> | string = [
+    const input = [
       {
         type: 'linear-gradient' as const,
         direction: '45DEG',
@@ -352,7 +350,7 @@ describe('processBackgroundImage', () => {
   });
 
   it('should process an array of style objects', () => {
-    const input: $ReadOnlyArray<BackgroundImageValue> | string = [
+    const input = [
       {
         type: 'linear-gradient' as const,
         direction: 'to bottom right',
@@ -376,7 +374,7 @@ describe('processBackgroundImage', () => {
   });
 
   it('should process an style object with default direction', () => {
-    const input: $ReadOnlyArray<BackgroundImageValue> | string = [
+    const input = [
       {
         type: 'linear-gradient' as const,
         colorStops: [{color: 'red'}, {color: 'blue'}],
@@ -390,7 +388,7 @@ describe('processBackgroundImage', () => {
   });
 
   it('should process style object with direction enum', () => {
-    const input: $ReadOnlyArray<BackgroundImageValue> | string = [
+    const input = [
       {
         type: 'linear-gradient' as const,
         direction: 'to right',
@@ -405,7 +403,7 @@ describe('processBackgroundImage', () => {
   });
 
   it('should process style object with direction angle', () => {
-    const input: $ReadOnlyArray<BackgroundImageValue> | string = [
+    const input = [
       {
         type: 'linear-gradient' as const,
         direction: '45deg',
@@ -420,7 +418,7 @@ describe('processBackgroundImage', () => {
   });
 
   it('should fix up stop positions #1', () => {
-    const input: $ReadOnlyArray<BackgroundImageValue> | string = [
+    const input = [
       {
         type: 'linear-gradient' as const,
         colorStops: [
@@ -458,7 +456,7 @@ describe('processBackgroundImage', () => {
   });
 
   it('should process multiple stop positions', () => {
-    const input: $ReadOnlyArray<BackgroundImageValue> | string = [
+    const input = [
       {
         type: 'linear-gradient' as const,
         colorStops: [
@@ -495,7 +493,7 @@ describe('processBackgroundImage', () => {
   });
 
   it('should fix up stop positions #2', () => {
-    const input: $ReadOnlyArray<BackgroundImageValue> | string = [
+    const input = [
       {
         type: 'linear-gradient' as const,
         colorStops: [
@@ -528,7 +526,7 @@ describe('processBackgroundImage', () => {
   });
 
   it('should fix up stop positions #3', () => {
-    const input: $ReadOnlyArray<BackgroundImageValue> | string = [
+    const input = [
       {
         type: 'linear-gradient' as const,
         colorStops: [
@@ -561,7 +559,7 @@ describe('processBackgroundImage', () => {
   });
 
   it('should fix up stop positions #4', () => {
-    const input: $ReadOnlyArray<BackgroundImageValue> | string = [
+    const input = [
       {
         type: 'linear-gradient' as const,
         colorStops: [

packages/react-native/Libraries/Text/React-RCTText.podspec

@@ -26,7 +26,7 @@ Pod::Spec.new do |s|
   s.author                 = "Meta Platforms, Inc. and its affiliates"
   s.platforms              = min_supported_versions
   s.source                 = source
-  s.source_files           = podspec_sources("**/*.{h,m,mm}", "**/*.h")
+  s.source_files           = "**/*.{h,m,mm}"
   s.preserve_paths         = "package.json", "LICENSE", "LICENSE-docs"
   s.header_dir             = "RCTText"
   s.framework              = ["MobileCoreServices"]

packages/react-native/Libraries/TypeSafety/RCTTypeSafety.podspec

@@ -25,7 +25,7 @@ Pod::Spec.new do |s|
   s.author                 = "Meta Platforms, Inc. and its affiliates"
   s.platforms              = min_supported_versions
   s.source                 = source
-  s.source_files           = podspec_sources("**/*.{c,h,m,mm,cpp}", "**/*.h")
+  s.source_files           = "**/*.{c,h,m,mm,cpp}"
   s.header_dir             = "RCTTypeSafety"
   s.pod_target_xcconfig    = {
                                "USE_HEADERMAP" => "YES",