Update @typescript-eslint (#52532)

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

Since we updated TypeScript in https://github.com/facebook/react-native/pull/51831, ESLint has printed a warning that `typescript/eslint` doesn't support our TS version.

This updates it to fix the warning.

Changelog: [Internal]

Differential Revision: D77833826

.flowconfig

@@ -48,7 +48,6 @@ 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
 
@@ -105,4 +104,4 @@ untyped-import
 untyped-type-import
 
 [version]
-^0.274.0
+^0.275.0

.github/actions/build-npm-package/action.yml

@@ -129,7 +129,7 @@ runs:
       run: yarn build
     - name: Build types
       shell: bash
-      run: yarn build-types
+      run: yarn build-types --skip-snapshot
     # Continue with publish steps
     - name: Set npm credentials
       if: ${{ inputs.release-type == 'release' ||

.github/actions/diff-js-api-breaking-changes/action.yml

@@ -0,0 +1,23 @@
+name: diff-js-api-breaking-changes
+description: Check for breaking changes in the public React Native JS API
+runs:
+  using: composite
+  steps:
+    - name: Fetch snapshot from PR head
+      shell: bash
+      env:
+        SCRATCH_DIR: ${{ runner.temp }}/diff-js-api-breaking-changes
+      run: |
+        mkdir $SCRATCH_DIR
+        git fetch --depth=1 origin ${{ github.event.pull_request.head.sha }}
+        git show ${{ github.event.pull_request.head.sha }}:packages/react-native/ReactNativeApi.d.ts > $SCRATCH_DIR/ReactNativeApi-after.d.ts \
+          || echo "" > $SCRATCH_DIR/ReactNativeApi.d.ts
+    - name: Run breaking change detection
+      shell: bash
+      env:
+        SCRATCH_DIR: ${{ runner.temp }}/diff-js-api-breaking-changes
+      run: |
+        node ./scripts/js-api/diff-api-snapshot \
+        ${{ github.workspace }}/packages/react-native/ReactNativeApi.d.ts  \
+        $SCRATCH_DIR/ReactNativeApi-after.d.ts \
+        > $SCRATCH_DIR/output.json

.github/actions/lint/action.yml

@@ -49,7 +49,7 @@ runs:
       run: yarn run lint-markdown
     - name: Build types
       shell: bash
-      run: yarn build-types
+      run: yarn build-types --skip-snapshot
     - name: Run typescript check of generated types
       shell: bash
       run: yarn test-generated-typescript

.github/actions/setup-node/action.yml

@@ -4,7 +4,7 @@ inputs:
   node-version:
     description: 'The node.js version to use'
     required: false
-    default: '22'
+    default: '22.14.0'
 runs:
   using: "composite"
   steps:

.github/actions/yarn-install/action.yml

@@ -2,6 +2,8 @@ name: yarn-install
 runs:
   using: composite
   steps:
+    - name: Setup node.js
+      uses: ./.github/actions/setup-node
     - name: Install dependencies
       shell: bash
       run: |

.github/workflow-scripts/__tests__/verifyArtifactsAreOnMaven-test.js

@@ -38,7 +38,7 @@ describe('#verifyArtifactsAreOnMaven', () => {
 
     expect(mockSleep).toHaveBeenCalledTimes(1);
     expect(mockFetch).toHaveBeenCalledWith(
-      'https://repo1.maven.org/maven2/com/facebook/react/react-native-artifacts/0.78.1',
+      'https://repo1.maven.org/maven2/com/facebook/react/react-native-artifacts/0.78.1/react-native-artifacts-0.78.1.pom',
     );
   });
 
@@ -55,7 +55,7 @@ describe('#verifyArtifactsAreOnMaven', () => {
 
     expect(mockSleep).toHaveBeenCalledTimes(1);
     expect(mockFetch).toHaveBeenCalledWith(
-      'https://repo1.maven.org/maven2/com/facebook/react/react-native-artifacts/0.78.1',
+      'https://repo1.maven.org/maven2/com/facebook/react/react-native-artifacts/0.78.1/react-native-artifacts-0.78.1.pom',
     );
   });
 
@@ -67,7 +67,7 @@ describe('#verifyArtifactsAreOnMaven', () => {
 
     expect(mockSleep).toHaveBeenCalledTimes(0);
     expect(mockFetch).toHaveBeenCalledWith(
-      'https://repo1.maven.org/maven2/com/facebook/react/react-native-artifacts/0.78.1',
+      'https://repo1.maven.org/maven2/com/facebook/react/react-native-artifacts/0.78.1/react-native-artifacts-0.78.1.pom',
     );
   });
 
@@ -81,7 +81,7 @@ describe('#verifyArtifactsAreOnMaven', () => {
     expect(mockSleep).toHaveBeenCalledTimes(90);
     expect(mockExit).toHaveBeenCalledWith(1);
     expect(mockFetch).toHaveBeenCalledWith(
-      'https://repo1.maven.org/maven2/com/facebook/react/react-native-artifacts/0.78.1',
+      'https://repo1.maven.org/maven2/com/facebook/react/react-native-artifacts/0.78.1/react-native-artifacts-0.78.1.pom',
     );
   });
 });

.github/workflow-scripts/verifyArtifactsAreOnMaven.js

@@ -13,13 +13,14 @@ const SLEEP_S = 60; // 1 minute
 const MAX_RETRIES = 90; // 90 attempts. Waiting between attempt: 1 min. Total time: 90 min.
 const ARTIFACT_URL =
   'https://repo1.maven.org/maven2/com/facebook/react/react-native-artifacts/';
+const ARTIFACT_NAME = 'react-native-artifacts-';
 
 async function verifyArtifactsAreOnMaven(version, retries = MAX_RETRIES) {
   if (version.startsWith('v')) {
     version = version.substring(1);
   }
 
-  const artifactUrl = `${ARTIFACT_URL}${version}`;
+  const artifactUrl = `${ARTIFACT_URL}${version}/${ARTIFACT_NAME}${version}.pom`;
   for (let currentAttempt = 1; currentAttempt <= retries; currentAttempt++) {
     const response = await fetch(artifactUrl);
 

.github/workflows/bump-podfile-lock.yml

@@ -18,6 +18,10 @@ jobs:
         run: |
           git config --local user.email "bot@reactnative.dev"
           git config --local user.name "React Native Bot"
+      - name: Setup xcode
+        uses: ./.github/actions/setup-xcode
+        with:
+          xcode-version: '16.2.0'
       - name: Extract branch name
         run: |
           TAG="${{ github.ref_name }}";

.github/workflows/danger-pr.yml

@@ -22,6 +22,8 @@ jobs:
         uses: ./.github/actions/setup-node
       - name: Run yarn install
         uses: ./.github/actions/yarn-install
+      - name: Run diff-js-api-breaking-changes
+        uses: ./.github/actions/diff-js-api-breaking-changes
       - name: Danger
         run: yarn danger ci --use-github-checks --failOnErrors
         working-directory: private/react-native-bots

.github/workflows/prebuild-ios-core.yml

@@ -83,7 +83,7 @@ jobs:
           # Move the XCFramework in the destination directory
           mv /tmp/third-party/packages/react-native/third-party/ReactNativeDependencies.xcframework packages/react-native/third-party/ReactNativeDependencies.xcframework
 
-          VERSION=$(jq -r '.version' package.json)
+          VERSION=$(jq -r '.version' packages/react-native/package.json)
           echo "$VERSION-${{matrix.flavor}}" > "packages/react-native/third-party/version.txt"
           cat "packages/react-native/third-party/version.txt"
           # Check destination directory

.github/workflows/publish-bumped-packages.yml

@@ -21,7 +21,7 @@ jobs:
       - name: Build packages
         run: yarn build
       - name: Build types
-        run: yarn build-types
+        run: yarn build-types --skip-snapshot
       - name: Set NPM auth token
         run: echo "//registry.npmjs.org/:_authToken=$GHA_NPM_TOKEN" > ~/.npmrc
       - name: Find and publish all bumped packages

.gitignore

@@ -175,3 +175,6 @@ fix_*.patch
 
 # [Experimental] Generated TS type definitions
 /packages/**/types_generated/
+
+/packages/debugger-shell/build/
+/packages/*/dist/

CHANGELOG-0.7x.md

@@ -1,5 +1,11 @@
 # Changelog (pre 0.80)
 
+## v0.79.5
+
+### Fixed
+
+- **Flow:** Publish top-level Flow types for `react-native` ([fbbd20dd63](https://github.com/facebook/react-native/commit/fbbd20dd632acd72d2abe861dd4a0e6e98437cf2) by [@buschco](https://github.com/buschco))
+
 ## v0.79.4
 
 ### Fixed
@@ -313,6 +319,31 @@ ChuiHW))
 - **JSC:** Clean up RCTBridgeDelegate to remove shouldBridgeUseCustomJSC method ([c8f1506f13](https://github.com/facebook/react-native/commit/c8f1506f13310ffafe370273805684e696d72d50) by [@zhongwuzw](https://github.com/zhongwuzw))
 - **Layout:** Remove no longer needed UISceneDelegate ([a033cf9d5e](https://github.com/facebook/react-native/commit/a033cf9d5e8ffbda8b6f86cf3ce152b4ccb73187) by [@okwasniewski](https://github.com/okwasniewski))
 
+## v0.78.3
+
+### Added
+
+#### Android specific
+
+- **Gradle:** RNGP - Add support for `exclusiveEnterpriseRepository` to specify an internal Maven mirror. ([6cb8dc37c7](https://github.com/facebook/react-native/commit/6cb8dc37c74995cba3f9f0a845919f305de53c3d) by [@cortinico](https://github.com/cortinico))
+
+### Fixed
+
+- **DevTools**: Temporarily disable eager evaluation and live expressions in the console tab ([07717b5275](https://github.com/facebook/react-native/commit/07717b5275d80cde7b2b4edbe032ab629127fbf0) by [@huntie](https://github.com/huntie))
+- **InteropLayer:** Fixed adding child views to a native view using the interop layer ([d53a60dd23](https://github.com/facebook/react-native/commit/d53a60dd23c5df8afca058a867c50df8b61f62e2) by [@chrfalch](https://github.com/chrfalch))
+- **Runtime:** Align timer IDs and timer function argument error handling with web standards. ([480a4642e5](https://github.com/facebook/react-native/commit/480a4642e5a644becf1c477d3d239f9b57efff3a) by [@kitten](https://github.com/kitten))
+
+#### Android specific
+
+- **StyleSheet:** Wrong `borderBottomEndRadius` on RTL ([68d6ada448](https://github.com/facebook/react-native/commit/68d6ada44893701b6006a6b1753131c7e880a30a) by [@riteshshukla04](https://github.com/riteshshukla04))
+
+#### iOS specific
+
+- **Codegen:** Skip codegen for selectively disabled libraries in react-native.config.js ([be8595b18a](https://github.com/facebook/react-native/commit/be8595b18a46635bf679d8e7473f2960c33530fa) by [@ismarbesic](https://github.com/ismarbesic))
+- **Layout:** Layout direction changes are now honored on bundle reload ([36f29beac4](https://github.com/facebook/react-native/commit/36f29beac47259768612bf56e5d9acfa4b94ab1a) by [@chrsmys](https://github.com/chrsmys))
+- **Runtime:** Re-enable enableFixForViewCommandRace feature flag ([ae59702f8e](https://github.com/facebook/react-native/commit/ae59702f8ee89e7bddec971e0a041744cb91e65c) by [@okwasniewski](https://github.com/okwasniewski))
+- **Switch:** Fixed switches correctly reverting to controlled state ([aa8c072870](https://github.com/facebook/react-native/commit/aa8c072870f6f9740e567a0f455c0e500ff1400c) by [@javache](https://github.com/javache))
+
 ## v0.78.2
 
 ### Changed

flow-typed/npm/electron-packager_v18.x.x.js

@@ -0,0 +1,149 @@
+/**
+ * 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
+ */
+
+declare module '@electron/packager' {
+  declare export type AsarOptions = $FlowFixMe;
+
+  declare export type ElectronDownloadRequestOptions = $FlowFixMe;
+
+  declare export type TargetDefinition = {
+    arch: TargetArch,
+    platform: TargetPlatform,
+  };
+
+  declare export type FinalizePackageTargetsHookFunction = (
+    targets: TargetDefinition[],
+    callback: HookFunctionErrorCallback,
+  ) => void;
+
+  declare export type HookFunction = (
+    buildPath: string,
+    electronVersion: string,
+    platform: TargetPlatform,
+    arch: TargetArch,
+    callback: HookFunctionErrorCallback,
+  ) => void;
+
+  declare export type IgnoreFunction = (path: string) => boolean;
+
+  declare export type HookFunctionErrorCallback = (err?: Error | null) => void;
+
+  declare export interface MacOSProtocol {
+    name: string;
+    schemes: string[];
+  }
+
+  declare export type NotaryToolCredentials = $FlowFixMe;
+
+  declare export type OsxSignOptions = $FlowFixMe;
+
+  declare export type OsxUniversalOptions = $FlowFixMe;
+
+  declare export type Win32MetadataOptions = $ReadOnly<{
+    CompanyName?: string,
+    FileDescription?: string,
+    OriginalFilename?: string,
+    ProductName?: string,
+    InternalName?: string,
+    'requested-execution-level'?:
+      | 'asInvoker'
+      | 'highestAvailable'
+      | 'requireAdministrator',
+    'application-manifest'?: string,
+  }>;
+
+  declare export type WindowsSignOptions = $FlowFixMe;
+
+  declare export type OfficialArch =
+    | 'ia32'
+    | 'x64'
+    | 'armv7l'
+    | 'arm64'
+    | 'mips64el'
+    | 'universal';
+
+  declare export type OfficialPlatform = 'linux' | 'win32' | 'darwin' | 'mas';
+
+  declare export type TargetArch = OfficialArch | string;
+
+  declare export type TargetPlatform = OfficialPlatform | string;
+
+  declare export type ArchOption = TargetArch | 'all';
+
+  declare export type PlatformOption = TargetPlatform | 'all';
+
+  declare export interface Options {
+    dir: string;
+    afterAsar?: HookFunction[];
+    afterComplete?: HookFunction[];
+    afterCopy?: HookFunction[];
+    afterCopyExtraResources?: HookFunction[];
+    afterExtract?: HookFunction[];
+    afterFinalizePackageTargets?: FinalizePackageTargetsHookFunction[];
+    afterInitialize?: HookFunction[];
+    afterPrune?: HookFunction[];
+    all?: boolean;
+    appBundleId?: string;
+    appCategoryType?: string;
+    appCopyright?: string;
+    appVersion?: string;
+    arch?: ArchOption | ArchOption[];
+    asar?: boolean | AsarOptions;
+    beforeAsar?: HookFunction[];
+    beforeCopy?: HookFunction[];
+    beforeCopyExtraResources?: HookFunction[];
+    buildVersion?: string;
+    darwinDarkModeSupport?: boolean;
+    derefSymlinks?: boolean;
+    download?: ElectronDownloadRequestOptions;
+    electronVersion?: string;
+    electronZipDir?: string;
+    executableName?: string;
+    extendHelperInfo?:
+      | string
+      | {
+          [property: string]: any,
+        };
+    extendInfo?:
+      | string
+      | {
+          [property: string]: any,
+        };
+    extraResource?: string | string[];
+    helperBundleId?: string;
+    icon?: string;
+    ignore?: RegExp | (string | RegExp)[] | IgnoreFunction;
+    junk?: boolean;
+    name?: string;
+    osxNotarize?: NotaryToolCredentials;
+    osxSign?: true | OsxSignOptions;
+    osxUniversal?: OsxUniversalOptions;
+    out?: string;
+    overwrite?: boolean;
+    platform?: TargetPlatform | 'all' | Array<TargetPlatform | 'all'>;
+    prebuiltAsar?: string;
+    protocols?: MacOSProtocol[];
+    prune?: boolean;
+    quiet?: boolean;
+    tmpdir?: string | false;
+    usageDescription?: {
+      [property: string]: string,
+    };
+    win32metadata?: Win32MetadataOptions;
+    windowsSign?: true | WindowsSignOptions;
+  }
+
+  declare function packager(options: Options): Promise<string[]>;
+
+  declare module.exports: typeof packager & {
+    packager: typeof packager,
+    default: typeof packager,
+  };
+}

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

jest/preprocessor.js

@@ -32,7 +32,7 @@ if (process.env.FBSOURCE_ENV === '1') {
   require('@fb-tools/babel-register');
 } else {
   // Register Babel to allow local packages to be loaded from source
-  require('../scripts/babel-register').registerForMonorepo();
+  require('../scripts/shared/babelRegister').registerForMonorepo();
 }
 
 const transformer = require('@react-native/metro-babel-transformer');

package.json

@@ -8,14 +8,16 @@
     "android": "yarn --cwd packages/rn-tester android",
     "build-android": "./gradlew :packages:react-native:ReactAndroid:build",
     "build": "node ./scripts/build/build.js",
-    "build-types": "node ./scripts/build-types",
+    "build-types": "node ./scripts/js-api/build-types",
     "clang-format": "clang-format -i --glob=*/**/*.{h,cpp,m,mm}",
     "clean": "node ./scripts/build/clean.js",
+    "cxx-api-build": "node ./scripts/cxx-api/public-api.js",
     "flow-check": "flow check",
     "flow": "flow",
     "format-check": "prettier --list-different \"./**/*.{js,md,yml,ts,tsx}\"",
     "format": "npm run prettier && npm run clang-format",
     "featureflags": "yarn --cwd packages/react-native featureflags",
+    "js-api-diff": "node ./scripts/js-api/diff-api-snapshot",
     "lint-ci": "./.github/workflow-scripts/analyze_code.sh && yarn shellcheck",
     "lint-markdown": "markdownlint-cli2 2>&1",
     "lint": "eslint --max-warnings 0 .",
@@ -32,7 +34,7 @@
     "test-typescript": "tsc -p packages/react-native/types/tsconfig.json",
     "test-generated-typescript": "tsc -p packages/react-native/types_generated/tsconfig.test.json",
     "test": "jest",
-    "fantom": "JS_DIR='..' yarn jest --config private/react-native-fantom/config/jest.config.js",
+    "fantom": "./scripts/fantom.sh",
     "trigger-react-native-release": "node ./scripts/releases-local/trigger-react-native-release.js",
     "update-lock": "npx yarn-deduplicate"
   },
@@ -49,16 +51,17 @@
     "@babel/plugin-transform-regenerator": "^7.24.7",
     "@babel/preset-env": "^7.25.3",
     "@babel/preset-flow": "^7.24.7",
+    "@electron/packager": "^18.3.6",
     "@jest/create-cache-key-function": "^29.7.0",
     "@microsoft/api-extractor": "^7.52.2",
-    "@react-native/metro-babel-transformer": "0.80.0-main",
-    "@react-native/metro-config": "0.80.0-main",
+    "@react-native/metro-babel-transformer": "0.81.0-main",
+    "@react-native/metro-config": "0.81.0-main",
     "@tsconfig/node22": "22.0.2",
     "@types/react": "^19.1.0",
-    "@typescript-eslint/parser": "^7.1.1",
+    "@typescript-eslint/parser": "^8.36.0",
     "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.29.1",
     "babel-plugin-transform-define": "^2.1.4",
     "babel-plugin-transform-flow-enums": "^0.0.2",
     "clang-format": "^1.8.0",
@@ -76,11 +79,12 @@
     "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.29.1",
+    "flow-bin": "^0.275.0",
     "glob": "^7.1.1",
-    "hermes-eslint": "0.29.0",
-    "hermes-transform": "0.29.0",
+    "hermes-eslint": "0.29.1",
+    "hermes-transform": "0.29.1",
+    "ini": "^5.0.0",
     "inquirer": "^7.1.0",
     "jest": "^29.7.0",
     "jest-config": "^29.7.0",
@@ -89,14 +93,14 @@
     "jest-snapshot": "^29.7.0",
     "markdownlint-cli2": "^0.17.2",
     "markdownlint-rule-relative-links": "^3.0.0",
-    "metro-babel-register": "^0.82.4",
-    "metro-memory-fs": "^0.82.4",
-    "metro-transform-plugins": "^0.82.4",
+    "metro-babel-register": "^0.82.5",
+    "metro-memory-fs": "^0.82.5",
+    "metro-transform-plugins": "^0.82.5",
     "micromatch": "^4.0.4",
     "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.29.1",
     "react": "19.1.0",
     "react-test-renderer": "19.1.0",
     "rimraf": "^3.0.2",

packages/assets/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@react-native/assets-registry",
-  "version": "0.80.0-main",
+  "version": "0.81.0-main",
   "description": "Asset support code for React Native.",
   "license": "MIT",
   "repository": {

packages/babel-plugin-codegen/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@react-native/babel-plugin-codegen",
-  "version": "0.80.0-main",
+  "version": "0.81.0-main",
   "description": "Babel plugin to generate native module and view manager code for React Native.",
   "license": "MIT",
   "repository": {
@@ -26,7 +26,7 @@
   ],
   "dependencies": {
     "@babel/traverse": "^7.25.3",
-    "@react-native/codegen": "0.80.0-main"
+    "@react-native/codegen": "0.81.0-main"
   },
   "devDependencies": {
     "@babel/core": "^7.25.2"

packages/community-cli-plugin/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@react-native/community-cli-plugin",
-  "version": "0.80.0-main",
+  "version": "0.81.0-main",
   "description": "Core CLI commands for React Native",
   "keywords": [
     "react-native",
@@ -22,16 +22,16 @@
     "dist"
   ],
   "dependencies": {
-    "@react-native/dev-middleware": "0.80.0-main",
+    "@react-native/dev-middleware": "0.81.0-main",
     "debug": "^4.4.0",
     "invariant": "^2.2.4",
-    "metro": "^0.82.4",
-    "metro-config": "^0.82.4",
-    "metro-core": "^0.82.4",
+    "metro": "^0.82.5",
+    "metro-config": "^0.82.5",
+    "metro-core": "^0.82.5",
     "semver": "^7.1.3"
   },
   "devDependencies": {
-    "metro-resolver": "^0.82.4"
+    "metro-resolver": "^0.82.5"
   },
   "peerDependencies": {
     "@react-native-community/cli": "*",

packages/community-cli-plugin/src/index.js

@@ -13,7 +13,7 @@ export type * from './index.flow';
 */
 
 if (!process.env.BUILD_EXCLUDE_BABEL_REGISTER) {
-  require('../../../scripts/babel-register').registerForMonorepo();
+  require('../../../scripts/shared/babelRegister').registerForMonorepo();
 }
 
 module.exports = require('./index.flow');

packages/core-cli-utils/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@react-native/core-cli-utils",
-  "version": "0.80.0-main",
+  "version": "0.81.0-main",
   "description": "React Native CLI library for Frameworks to build on",
   "license": "MIT",
   "main": "./src/index.flow.js",

packages/core-cli-utils/src/index.js

@@ -13,7 +13,7 @@ export type * from './index.flow';
 */
 
 if (process.env.BUILD_EXCLUDE_BABEL_REGISTER == null) {
-  require('../../../scripts/babel-register').registerForMonorepo();
+  require('../../../scripts/shared/babelRegister').registerForMonorepo();
 }
 
 module.exports = require('./index.flow');

packages/core-cli-utils/src/private/apple.js

@@ -125,7 +125,7 @@ export const tasks = {
       }),
     ),
     installDependencies: task(FIFTH, 'Install CocoaPods dependencies', () => {
-      const env = {
+      const env: {[string]: string | void} = {
         RCT_NEW_ARCH_ENABLED: options.newArchitecture ? '1' : '0',
         USE_FRAMEWORKS: options.frameworks,
         USE_HERMES: options.hermes ? '1' : '0',

packages/core-cli-utils/src/public/version.js

@@ -13,7 +13,7 @@ export type * from './version.flow';
 */
 
 if (process.env.BUILD_EXCLUDE_BABEL_REGISTER == null) {
-  require('../../../../scripts/babel-register').registerForMonorepo();
+  require('../../../../scripts/shared/babelRegister').registerForMonorepo();
 }
 
 module.exports = require('./version.flow');

packages/debugger-frontend/BUILD_INFO

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

packages/debugger-frontend/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@react-native/debugger-frontend",
-  "version": "0.80.0-main",
+  "version": "0.81.0-main",
   "description": "Debugger frontend for React Native based on Chrome DevTools",
   "keywords": [
     "react-native",

packages/debugger-shell/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@react-native/debugger-shell",
-  "version": "0.80.0-main",
+  "version": "0.81.0-main",
   "description": "Experimental debugger shell for React Native for use with @react-native/debugger-frontend",
   "keywords": [
     "react-native",
@@ -8,7 +8,7 @@
   ],
   "homepage": "https://github.com/facebook/react-native/tree/HEAD/packages/debugger-shell#readme",
   "bugs": "https://github.com/facebook/react-native/issues",
-  "main": "./src/node/index.js",
+  "main": "./src/index.js",
   "exports": {
     ".": {
       "node": "./src/node/index.js",
@@ -27,11 +27,11 @@
   "license": "MIT",
   "engines": {
     "node": ">= 22.14.0",
-    "electron": ">=36.2.0"
+    "electron": ">=36.3.0"
   },
   "dependencies": {
     "cross-spawn": "^7.0.6",
-    "electron": "36.2.0"
+    "electron": "36.3.0"
   },
   "devDependencies": {
     "semver": "^7.1.3"

packages/debugger-shell/src/electron/MainInstanceEntryPoint.js

@@ -10,6 +10,7 @@
 
 // $FlowFixMe[unclear-type] We have no Flow types for the Electron API.
 const {BrowserWindow, app, shell, ipcMain} = require('electron') as any;
+const path = require('path');
 const util = require('util');
 
 const windowMetadata = new WeakMap<
@@ -68,6 +69,8 @@ function handleLaunchArgs(argv: string[]) {
       partition: 'persist:react-native-devtools',
       preload: require.resolve('./preload.js'),
     },
+    // Icon for Linux
+    icon: path.join(__dirname, 'resources', 'icon.png'),
   });
 
   // Open links in the default browser instead of in new Electron windows.
@@ -90,7 +93,7 @@ function handleLaunchArgs(argv: string[]) {
 }
 
 app.whenReady().then(() => {
-  handleLaunchArgs(process.argv.slice(2));
+  handleLaunchArgs(process.argv.slice(app.isPackaged ? 1 : 2));
 
   app.on(
     'second-instance',

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

@@ -13,7 +13,7 @@ export type * from './index.flow';
 */
 
 if (!Boolean(process.env.BUILD_EXCLUDE_BABEL_REGISTER)) {
-  require('../../../../scripts/babel-register').registerForMonorepo();
+  require('../../../../scripts/shared/babelRegister').registerForMonorepo();
 }
 
 module.exports = require('./index.flow');

packages/debugger-shell/src/index.js

@@ -0,0 +1,26 @@
+/**
+ * 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
+ */
+
+// As far as Flow is concerned, this package is Node-only.
+/*::
+export type * from './node';
+const Node = require('./node');
+declare module.exports: typeof Node;
+*/
+
+// Because Electron doesn't support package.json `exports`, we need to
+// switch at runtime.
+if ('electron' in process.versions) {
+  // $FlowIgnore[invalid-export]
+  module.exports = require('./electron');
+} else {
+  // $FlowIgnore[invalid-export]
+  module.exports = require('./node');
+}

packages/debugger-shell/src/node/index.js

@@ -13,7 +13,7 @@ export type * from './index.flow';
 */
 
 if (!process.env.BUILD_EXCLUDE_BABEL_REGISTER) {
-  require('../../../../scripts/babel-register').registerForMonorepo();
+  require('../../../../scripts/shared/babelRegister').registerForMonorepo();
 }
 
 export * from './index.flow';

packages/dev-middleware/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@react-native/dev-middleware",
-  "version": "0.80.0-main",
+  "version": "0.81.0-main",
   "description": "Dev server middleware for React Native",
   "keywords": [
     "react-native",
@@ -23,7 +23,7 @@
   ],
   "dependencies": {
     "@isaacs/ttlcache": "^1.4.1",
-    "@react-native/debugger-frontend": "0.80.0-main",
+    "@react-native/debugger-frontend": "0.81.0-main",
     "chrome-launcher": "^0.15.2",
     "chromium-edge-launcher": "^0.2.0",
     "connect": "^3.6.5",

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

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

packages/dev-middleware/src/index.js

@@ -13,7 +13,7 @@ export type * from './index.flow';
 */
 
 if (!process.env.BUILD_EXCLUDE_BABEL_REGISTER) {
-  require('../../../scripts/babel-register').registerForMonorepo();
+  require('../../../scripts/shared/babelRegister').registerForMonorepo();
 }
 
 export * from './index.flow';

packages/dev-middleware/src/inspector-proxy/InspectorProxy.js

@@ -22,6 +22,7 @@ import type {
 import type {IncomingMessage, ServerResponse} from 'http';
 
 import getBaseUrlFromRequest from '../utils/getBaseUrlFromRequest';
+import getDevToolsFrontendUrl from '../utils/getDevToolsFrontendUrl';
 import Device from './Device';
 import EventLoopPerfTracker from './EventLoopPerfTracker';
 import InspectorProxyHeartbeat from './InspectorProxyHeartbeat';
@@ -249,13 +250,15 @@ export default class InspectorProxy implements InspectorProxyQueries {
 
     const webSocketUrlWithoutProtocol = `${host}${WS_DEBUGGER_URL}?device=${deviceId}&page=${page.id}`;
     const webSocketDebuggerUrl = `${webSocketScheme}://${webSocketUrlWithoutProtocol}`;
-
-    // For now, `/json/list` returns the legacy built-in `devtools://` URL, to
-    // preserve existing handling by Flipper. This may return a placeholder in
-    // future -- please use the `/open-debugger` endpoint.
-    const devtoolsFrontendUrl =
-      `devtools://devtools/bundled/js_app.html?experiments=true&v8only=true&${webSocketScheme}=` +
-      encodeURIComponent(webSocketUrlWithoutProtocol);
+    const devtoolsFrontendUrl = getDevToolsFrontendUrl(
+      this.#experiments,
+      webSocketDebuggerUrl,
+      this.#serverBaseUrl.origin,
+      {
+        relative: true,
+        useFuseboxEntryPoint: page.capabilities.prefersFuseboxFrontend,
+      },
+    );
 
     return {
       id: `${deviceId}-${page.id}`,

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

@@ -1,6 +1,6 @@
 {
   "name": "@react-native/eslint-config",
-  "version": "0.80.0-main",
+  "version": "0.81.0-main",
   "description": "ESLint config for React Native",
   "license": "MIT",
   "repository": {
@@ -22,9 +22,9 @@
   "dependencies": {
     "@babel/core": "^7.25.2",
     "@babel/eslint-parser": "^7.25.1",
-    "@react-native/eslint-plugin": "0.80.0-main",
-    "@typescript-eslint/eslint-plugin": "^7.1.1",
-    "@typescript-eslint/parser": "^7.1.1",
+    "@react-native/eslint-plugin": "0.81.0-main",
+    "@typescript-eslint/eslint-plugin": "^8.36.0",
+    "@typescript-eslint/parser": "^8.36.0",
     "eslint-config-prettier": "^8.5.0",
     "eslint-plugin-eslint-comments": "^3.2.0",
     "eslint-plugin-ft-flow": "^2.0.1",

packages/eslint-plugin-react-native/__tests__/no-deep-imports-test.js

@@ -31,6 +31,8 @@ eslintTester.run('../no-deep-imports', rule, {
     "import Foo from 'react/native/Foo';",
     "import 'react-native/Libraries/Core/InitializeCore';",
     "require('react-native/Libraries/Core/InitializeCore');",
+    "import Foo from 'react-native/src/fb_internal/Foo'",
+    "require('react-native/src/fb_internal/Foo')",
   ],
   invalid: [
     {
@@ -103,5 +105,25 @@ eslintTester.run('../no-deep-imports', rule, {
       ],
       output: null,
     },
+    {
+      code: "import type {RootTag} from 'react-native/Libraries/Types/RootTagTypes';",
+      errors: [
+        {
+          messageId: 'deepImport',
+          data: {importPath: 'react-native/Libraries/Types/RootTagTypes'},
+        },
+      ],
+      output: "import type {RootTag} from 'react-native';",
+    },
+    {
+      code: "import type {ModalBaseProps, Foo} from 'react-native/Libraries/Modal/Modal';",
+      errors: [
+        {
+          messageId: 'deepImport',
+          data: {importPath: 'react-native/Libraries/Modal/Modal'},
+        },
+      ],
+      output: null,
+    },
   ],
 });

packages/eslint-plugin-react-native/no-deep-imports.js

@@ -31,7 +31,8 @@ module.exports = {
       ImportDeclaration(node) {
         if (
           !isDeepReactNativeImport(node.source) ||
-          isInitializeCoreImport(node.source)
+          isInitializeCoreImport(node.source) ||
+          isFbInternalImport(node.source)
         ) {
           return;
         }
@@ -40,25 +41,55 @@ module.exports = {
             'react-native/'.length,
           );
           const publicAPIDefaultComponent = publicAPIMapping[reactNativeSource];
-          if (publicAPIDefaultComponent) {
+          if (publicAPIDefaultComponent && publicAPIDefaultComponent.default) {
             context.report({
               ...getStandardReport(node.source),
               fix(fixer) {
                 return fixer.replaceText(
                   node,
-                  `import {${publicAPIDefaultComponent}} from 'react-native';`,
+                  `import {${publicAPIDefaultComponent.default}} from 'react-native';`,
                 );
               },
             });
           } else {
             context.report(getStandardReport(node.source));
           }
+        } else if (isTypeImport(node)) {
+          const reactNativeSource = node.source.value.slice(
+            'react-native/'.length,
+          );
+          const publicAPIDefaultComponent = publicAPIMapping[reactNativeSource];
+          if (publicAPIDefaultComponent && publicAPIDefaultComponent.types) {
+            const typeNames = [];
+            for (const specifier of node.specifiers) {
+              const importedName = specifier.imported.name;
+              if (!publicAPIDefaultComponent.types.includes(importedName)) {
+                context.report(getStandardReport(node.source));
+                return;
+              }
+              typeNames.push(importedName);
+            }
+
+            context.report({
+              ...getStandardReport(node.source),
+              fix(fixer) {
+                return fixer.replaceText(
+                  node,
+                  `import type {${typeNames.join(', ')}} from 'react-native';`,
+                );
+              },
+            });
+          }
         } else {
           context.report(getStandardReport(node.source));
         }
       },
       CallExpression(node) {
-        if (!isDeepRequire(node) || isInitializeCoreImport(node.arguments[0])) {
+        if (
+          !isDeepRequire(node) ||
+          isInitializeCoreImport(node.arguments[0]) ||
+          isFbInternalImport(node.arguments[0])
+        ) {
           return;
         }
 
@@ -71,13 +102,13 @@ module.exports = {
         ) {
           const reactNativeSource = importPath.slice('react-native/'.length);
           const publicAPIDefaultComponent = publicAPIMapping[reactNativeSource];
-          if (publicAPIDefaultComponent) {
+          if (publicAPIDefaultComponent && publicAPIDefaultComponent.default) {
             context.report({
               ...getStandardReport(node.arguments[0]),
               fix(fixer) {
                 return fixer.replaceText(
                   parent,
-                  `{${publicAPIDefaultComponent}} = require('react-native')`,
+                  `{${publicAPIDefaultComponent.default}} = require('react-native')`,
                 );
               },
             });
@@ -109,6 +140,10 @@ module.exports = {
       );
     }
 
+    function isTypeImport(node) {
+      return node.type === 'ImportDeclaration' && node.importKind === 'type';
+    }
+
     function isDeepRequire(node) {
       return (
         node.callee.type === 'Identifier' &&
@@ -137,5 +172,13 @@ module.exports = {
 
       return source.value === 'react-native/Libraries/Core/InitializeCore';
     }
+
+    function isFbInternalImport(source) {
+      if (source.type !== 'Literal' || typeof source.value !== 'string') {
+        return false;
+      }
+
+      return source.value.startsWith('react-native/src/fb_internal/');
+    }
   },
 };

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

@@ -1,6 +1,6 @@
 {
   "name": "@react-native/eslint-plugin",
-  "version": "0.80.0-main",
+  "version": "0.81.0-main",
   "description": "ESLint rules for @react-native/eslint-config",
   "license": "MIT",
   "repository": {
@@ -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.29.1",
+    "hermes-eslint": "0.29.1"
   },
   "engines": {
     "node": ">= 22.14.0"

packages/eslint-plugin-react-native/utils.js

@@ -17,92 +17,513 @@
  * If the path is not matched, the auto-fix won't be suggested.
  */
 const publicAPIMapping = {
-  'Libraries/Components/AccessibilityInfo/AccessibilityInfo':
-    'AccessibilityInfo',
-  'Libraries/Components/ActivityIndicator/ActivityIndicator':
-    'ActivityIndicator',
-  'Libraries/Components/Button': 'Button',
-  'Libraries/Components/DrawerAndroid/DrawerLayoutAndroid':
-    'DrawerLayoutAndroid',
-  'Libraries/Components/LayoutConformance/LayoutConformance':
-    'experimental_LayoutConformance',
-  'Libraries/Lists/FlatList': 'FlatList',
-  'Libraries/Image/Image': 'Image',
-  'Libraries/Image/ImageBackground': 'ImageBackground',
-  'Libraries/Components/TextInput/InputAccessoryView': 'InputAccessoryView',
-  'Libraries/Components/Keyboard/KeyboardAvoidingView': 'KeyboardAvoidingView',
-  'Libraries/Modal/Modal': 'Modal',
-  'Libraries/Components/Pressable/Pressable': 'Pressable',
-  'Libraries/Components/ProgressBarAndroid/ProgressBarAndroid':
-    'ProgressBarAndroid',
-  'Libraries/Components/RefreshControl/RefreshControl': 'RefreshControl',
-  'Libraries/Components/SafeAreaView/SafeAreaView': 'SafeAreaView',
-  'Libraries/Components/ScrollView/ScrollView': 'ScrollView',
-  'Libraries/Lists/SectionList': 'SectionList',
-  'Libraries/Components/StatusBar/StatusBar': 'StatusBar',
-  'Libraries/Components/Switch/Switch': 'Switch',
-  'Libraries/Text/Text': 'Text',
-  'Libraries/Components/TextInput/TextInput': 'TextInput',
-  'Libraries/Components/Touchable/Touchable': 'Touchable',
-  'Libraries/Components/Touchable/TouchableHighlight': 'TouchableHighlight',
-  'Libraries/Components/Touchable/TouchableNativeFeedback':
-    'TouchableNativeFeedback',
-  'Libraries/Components/Touchable/TouchableOpacity': 'TouchableOpacity',
-  'Libraries/Components/Touchable/TouchableWithoutFeedback':
-    'TouchableWithoutFeedback',
-  'Libraries/Components/View/View': 'View',
-  'Libraries/Lists/VirtualizedList': 'VirtualizedList',
-  'Libraries/Lists/VirtualizedSectionList': 'VirtualizedSectionList',
-  'Libraries/ActionSheetIOS/ActionSheetIOS': 'ActionSheetIOS',
-  'Libraries/Alert/Alert': 'Alert',
-  'Libraries/Animated/Animated': 'Animated',
-  'Libraries/Utilities/Appearance': 'Appearance',
-  'Libraries/ReactNative/AppRegistry': 'AppRegistry',
-  'Libraries/AppState/AppState': 'AppState',
-  'Libraries/Utilities/BackHandler': 'BackHandler',
-  'Libraries/Components/Clipboard/Clipboard': 'Clipboard',
-  'Libraries/Utilities/DeviceInfo': 'DeviceInfo',
-  'src/private/devsupport/devmenu/DevMenu': 'DevMenu',
-  'Libraries/Utilities/DevSettings': 'DevSettings',
-  'Libraries/Utilities/Dimensions': 'Dimensions',
-  'Libraries/Animated/Easing': 'Easing',
-  'Libraries/ReactNative/I18nManager': 'I18nManager',
-  'Libraries/Interaction/InteractionManager': 'InteractionManager',
-  'Libraries/Components/Keyboard/Keyboard': 'Keyboard',
-  'Libraries/LayoutAnimation/LayoutAnimation': 'LayoutAnimation',
-  'Libraries/Linking/Linking': 'Linking',
-  'Libraries/LogBox/LogBox': 'LogBox',
-  'Libraries/NativeModules/specs/NativeDialogManagerAndroid':
-    'NativeDialogManagerAndroid',
-  'Libraries/EventEmitter/NativeEventEmitter': 'NativeEventEmitter',
-  'Libraries/Network/RCTNetworking': 'Networking',
-  'Libraries/Interaction/PanResponder': 'PanResponder',
-  'Libraries/PermissionsAndroid/PermissionsAndroid': 'PermissionsAndroid',
-  'Libraries/Utilities/PixelRatio': 'PixelRatio',
-  'Libraries/PushNotificationIOS/PushNotificationIOS': 'PushNotificationIOS',
-  'Libraries/Settings/Settings': 'Settings',
-  'Libraries/Share/Share': 'Share',
-  'Libraries/StyleSheet/StyleSheet': 'StyleSheet',
-  'Libraries/Performance/Systrace': 'Systrace',
-  'Libraries/Components/ToastAndroid/ToastAndroid': 'ToastAndroid',
-  'Libraries/TurboModule/TurboModuleRegistry': 'TurboModuleRegistry',
-  'Libraries/ReactNative/UIManager': 'UIManager',
-  'Libraries/Animated/useAnimatedValue': 'useAnimatedValue',
-  'Libraries/Utilities/useColorScheme': 'useColorScheme',
-  'Libraries/Utilities/useWindowDimensions': 'useWindowDimensions',
-  'Libraries/UTFSequence': 'UTFSequence',
-  'Libraries/Vibration/Vibration': 'Vibration',
-  'Libraries/Utilities/codegenNativeComponent': 'codegenNativeComponent',
-  'Libraries/Utilities/codegenNativeCommands': 'codegenNativeCommands',
-  'Libraries/EventEmitter/RCTDeviceEventEmitter': 'DeviceEventEmitter',
-  'Libraries/StyleSheet/PlatformColorValueTypesIOS': 'DynamicColorIOS',
-  'Libraries/EventEmitter/RCTNativeAppEventEmitter': 'NativeAppEventEmitter',
-  'Libraries/BatchedBridge/NativeModules': 'NativeModules',
-  'Libraries/Utilities/Platform': 'Platform',
-  'Libraries/StyleSheet/PlatformColorValueTypes': 'PlatformColor',
-  'Libraries/StyleSheet/processColor': 'processColor',
-  'Libraries/ReactNative/requireNativeComponent': 'requireNativeComponent',
-  'Libraries/ReactNative/RootTag': 'RootTagContext',
+  'Libraries/Components/AccessibilityInfo/AccessibilityInfo': {
+    default: 'AccessibilityInfo',
+    types: null,
+  },
+  'Libraries/Components/ActivityIndicator/ActivityIndicator': {
+    default: 'ActivityIndicator',
+    types: ['ActivityIndicatorProps'],
+  },
+  'Libraries/Components/Button': {
+    default: 'Button',
+    types: ['ButtonProps'],
+  },
+  'Libraries/Components/DrawerAndroid/DrawerLayoutAndroid': {
+    default: 'DrawerLayoutAndroid',
+    types: ['DrawerLayoutAndroidProps', 'DrawerSlideEvent'],
+  },
+  'Libraries/Components/LayoutConformance/LayoutConformance': {
+    default: 'experimental_LayoutConformance',
+    types: ['LayoutConformanceProps'],
+  },
+  'Libraries/Lists/FlatList': {
+    default: 'FlatList',
+    types: ['FlatListProps'],
+  },
+  'Libraries/Image/Image': {
+    default: 'Image',
+    types: [
+      'ImageBackgroundProps',
+      'ImageErrorEvent',
+      'ImageLoadEvent',
+      'ImageProgressEventIOS',
+      'ImageProps',
+      'ImagePropsAndroid',
+      'ImagePropsBase',
+      'ImagePropsIOS',
+      'ImageResolvedAssetSource',
+      'ImageSize',
+      'ImageSourcePropType',
+    ],
+  },
+  'Libraries/Image/ImageSource': {
+    default: null,
+    types: ['ImageRequireSource', 'ImageSource', 'ImageURISource'],
+  },
+  'Libraries/Image/ImageBackground': {
+    default: 'ImageBackground',
+    types: null,
+  },
+  'Libraries/Components/TextInput/InputAccessoryView': {
+    default: 'InputAccessoryView',
+    types: ['InputAccessoryViewProps'],
+  },
+  'Libraries/Components/Keyboard/KeyboardAvoidingView': {
+    default: 'KeyboardAvoidingView',
+    types: ['KeyboardAvoidingViewProps'],
+  },
+  'Libraries/Modal/Modal': {
+    default: 'Modal',
+    types: [
+      'ModalBaseProps',
+      'ModalProps',
+      'ModalPropsAndroid',
+      'ModalPropsIOS',
+    ],
+  },
+  'Libraries/Components/Pressable/Pressable': {
+    default: 'Pressable',
+    types: [
+      'PressableAndroidRippleConfig',
+      'PressableProps',
+      'PressableStateCallbackType',
+    ],
+  },
+  'Libraries/Components/ProgressBarAndroid/ProgressBarAndroid': {
+    default: 'ProgressBarAndroid',
+    types: ['ProgressBarAndroidProps'],
+  },
+  'Libraries/Components/RefreshControl/RefreshControl': {
+    default: 'RefreshControl',
+    types: [
+      'RefreshControlProps',
+      'RefreshControlPropsAndroid',
+      'RefreshControlPropsIOS',
+    ],
+  },
+  'Libraries/Components/SafeAreaView/SafeAreaView': {
+    default: 'SafeAreaView',
+    types: null,
+  },
+  'Libraries/Components/ScrollView/ScrollView': {
+    default: 'ScrollView',
+    types: [
+      'ScrollResponderType',
+      'ScrollViewProps',
+      'ScrollViewPropsAndroid',
+      'ScrollViewPropsIOS',
+      'ScrollViewImperativeMethods',
+      'ScrollViewScrollToOptions',
+    ],
+  },
+  'Libraries/Lists/SectionList': {
+    default: 'SectionList',
+    types: [
+      'SectionListProps',
+      'SectionListRenderItem',
+      'SectionListRenderItemInfo',
+      'SectionListData',
+    ],
+  },
+  'Libraries/Components/StatusBar/StatusBar': {
+    default: 'StatusBar',
+    types: ['StatusBarAnimation', 'StatusBarProps', 'StatusBarStyle'],
+  },
+  'Libraries/Components/Switch/Switch': {
+    default: 'Switch',
+    types: ['SwitchChangeEvent', 'SwitchProps'],
+  },
+  'Libraries/Text/Text': {
+    default: 'Text',
+    types: ['TextProps'],
+  },
+  'Libraries/Components/TextInput/TextInput': {
+    default: 'TextInput',
+    types: [
+      'AutoCapitalize',
+      'EnterKeyHintTypeOptions',
+      'KeyboardTypeOptions',
+      'InputModeOptions',
+      'TextContentType',
+      'TextInputAndroidProps',
+      'TextInputIOSProps',
+      'TextInputProps',
+      'TextInputChangeEvent',
+      'TextInputContentSizeChangeEvent',
+      'TextInputEndEditingEvent',
+      'TextInputFocusEvent',
+      'TextInputKeyPressEvent',
+      'TextInputSelectionChangeEvent',
+      'TextInputSubmitEditingEvent',
+      'ReturnKeyTypeOptions',
+      'SubmitBehavior',
+    ],
+  },
+  'Libraries/Components/Touchable/Touchable': {
+    default: 'Touchable',
+    types: null,
+  },
+  'Libraries/Components/Touchable/TouchableHighlight': {
+    default: 'TouchableHighlight',
+    types: ['TouchableHighlightProps'],
+  },
+  'Libraries/Components/Touchable/TouchableNativeFeedback': {
+    default: 'TouchableNativeFeedback',
+    types: ['TouchableNativeFeedbackProps'],
+  },
+  'Libraries/Components/Touchable/TouchableOpacity': {
+    default: 'TouchableOpacity',
+    types: ['TouchableOpacityProps'],
+  },
+  'Libraries/Components/Touchable/TouchableWithoutFeedback': {
+    default: 'TouchableWithoutFeedback',
+    types: ['TouchableWithoutFeedbackProps'],
+  },
+  'Libraries/Components/View/View': {
+    default: 'View',
+    types: null,
+  },
+  'Libraries/Components/View/ViewAccessibility': {
+    default: null,
+    types: [
+      'AccessibilityActionEvent',
+      'AccessibilityProps',
+      'AccessibilityRole',
+      'AccessibilityState',
+      'AccessibilityValue',
+      'Role',
+    ],
+  },
+  'Libraries/Components/View/ViewPropTypes': {
+    default: null,
+    types: [
+      'GestureResponderHandlers',
+      'TVViewPropsIOS',
+      'ViewProps',
+      'ViewPropsAndroid',
+      'ViewPropsIOS',
+    ],
+  },
+  'Libraries/Lists/VirtualizedList': {
+    default: 'VirtualizedList',
+    types: [
+      'ListRenderItemInfo',
+      'ListRenderItem',
+      'Separators',
+      'VirtualizedListProps',
+    ],
+  },
+  'Libraries/Lists/VirtualizedSectionList': {
+    default: 'VirtualizedSectionList',
+    types: [
+      'ScrollToLocationParamsType',
+      'SectionBase',
+      'VirtualizedSectionListProps',
+    ],
+  },
+  'Libraries/ActionSheetIOS/ActionSheetIOS': {
+    default: 'ActionSheetIOS',
+    types: [
+      'ActionSheetIOSOptions',
+      'ShareActionSheetIOSOptions',
+      'ShareActionSheetError',
+    ],
+  },
+  'Libraries/Alert/Alert': {
+    default: 'Alert',
+    types: ['AlertType', 'AlertButtonStyle', 'AlertButton', 'AlertOptions'],
+  },
+  'Libraries/Animated/Animated': {
+    default: 'Animated',
+    types: null,
+  },
+  'Libraries/Utilities/Appearance': {
+    default: 'Appearance',
+    types: null,
+  },
+  'Libraries/ReactNative/AppRegistry': {
+    default: 'AppRegistry',
+    types: [
+      'TaskProvider',
+      'ComponentProvider',
+      'ComponentProviderInstrumentationHook',
+      'AppConfig',
+      'Runnable',
+      'Runnables',
+      'Registry',
+      'WrapperComponentProvider',
+      'RootViewStyleProvider',
+    ],
+  },
+  'Libraries/AppState/AppState': {
+    default: 'AppState',
+    types: ['AppStateStatus', 'AppStateEvent'],
+  },
+  'Libraries/Utilities/BackHandler': {
+    default: 'BackHandler',
+    types: ['BackPressEventName'],
+  },
+  'Libraries/Components/Clipboard/Clipboard': {
+    default: 'Clipboard',
+    types: null,
+  },
+  'Libraries/Utilities/DeviceInfo': {
+    default: 'DeviceInfo',
+    types: ['DeviceInfoConstants'],
+  },
+  'src/private/devsupport/devmenu/DevMenu': {
+    default: 'DevMenu',
+    types: null,
+  },
+  'Libraries/Utilities/DevSettings': {
+    default: 'DevSettings',
+    types: null,
+  },
+  'Libraries/Utilities/Dimensions': {
+    default: 'Dimensions',
+    types: [
+      'DimensionsPayload',
+      'DisplayMetrics',
+      'DisplayMetricsAndroid',
+      'ScaledSize',
+    ],
+  },
+  'Libraries/Animated/Easing': {
+    default: 'Easing',
+    types: ['EasingFunction'],
+  },
+  'Libraries/ReactNative/I18nManager': {
+    default: 'I18nManager',
+    types: null,
+  },
+  'Libraries/Interaction/InteractionManager': {
+    default: 'InteractionManager',
+    types: ['Handle', 'PromiseTask', 'SimpleTask'],
+  },
+  'Libraries/Components/Keyboard/Keyboard': {
+    default: 'Keyboard',
+    types: [
+      'AndroidKeyboardEvent',
+      'IOSKeyboardEvent',
+      'KeyboardEvent',
+      'KeyboardEventEasing',
+      'KeyboardEventName',
+      'KeyboardMetrics',
+    ],
+  },
+  'Libraries/LayoutAnimation/LayoutAnimation': {
+    default: 'LayoutAnimation',
+    types: [
+      'LayoutAnimationAnim',
+      'LayoutAnimationConfig',
+      'LayoutAnimationProperties',
+      'LayoutAnimationProperty',
+      'LayoutAnimationType',
+      'LayoutAnimationTypes',
+    ],
+  },
+  'Libraries/Linking/Linking': {
+    default: 'Linking',
+    types: null,
+  },
+  'Libraries/LogBox/LogBox': {
+    default: 'LogBox',
+    types: ['ExtendedExceptionData', 'IgnorePattern', 'LogData'],
+  },
+  'Libraries/NativeModules/specs/NativeDialogManagerAndroid': {
+    default: 'NativeDialogManagerAndroid',
+    types: null,
+  },
+  'Libraries/EventEmitter/NativeEventEmitter': {
+    default: 'NativeEventEmitter',
+    types: [
+      'EventSubscription',
+      'EmitterSubscription',
+      'NativeEventSubscription',
+    ],
+  },
+  'Libraries/Network/RCTNetworking': {
+    default: 'Networking',
+    types: null,
+  },
+  'Libraries/Interaction/PanResponder': {
+    default: 'PanResponder',
+    types: [
+      'PanResponderCallbacks',
+      'PanResponderGestureState',
+      'PanResponderInstance',
+    ],
+  },
+  'Libraries/PermissionsAndroid/PermissionsAndroid': {
+    default: 'PermissionsAndroid',
+    types: ['Permission', 'PermissionStatus', 'Rationale'],
+  },
+  'Libraries/Utilities/PixelRatio': {
+    default: 'PixelRatio',
+    types: null,
+  },
+  'Libraries/PushNotificationIOS/PushNotificationIOS': {
+    default: 'PushNotificationIOS',
+    types: ['PushNotificationEventName', 'PushNotificationPermissions'],
+  },
+  'Libraries/Settings/Settings': {
+    default: 'Settings',
+    types: null,
+  },
+  'Libraries/Share/Share': {
+    default: 'Share',
+    types: ['ShareAction', 'ShareContent', 'ShareOptions'],
+  },
+  'Libraries/StyleSheet/StyleSheet': {
+    default: 'StyleSheet',
+    types: [
+      'ColorValue',
+      'ImageStyle',
+      'FilterFunction',
+      'FontVariant',
+      'NativeColorValue',
+      'OpaqueColorValue',
+      'StyleProp',
+      'TextStyle',
+      'TransformsStyle',
+      'ViewStyle',
+    ],
+  },
+  'Libraries/StyleSheet/StyleSheetTypes': {
+    default: null,
+    types: [
+      'BoxShadowValue',
+      'CursorValue',
+      'DimensionValue',
+      'DropShadowValue',
+      'EdgeInsetsValue',
+      'PointValue',
+    ],
+  },
+  'Libraries/StyleSheet/Rect': {
+    default: null,
+    types: ['Insets'],
+  },
+  'Libraries/Performance/Systrace': {
+    default: 'Systrace',
+    types: null,
+  },
+  'Libraries/Components/ToastAndroid/ToastAndroid': {
+    default: 'ToastAndroid',
+    types: null,
+  },
+  'Libraries/TurboModule/TurboModuleRegistry': {
+    default: 'TurboModuleRegistry',
+    types: null,
+  },
+  'Libraries/TurboModule/RCTExport': {
+    default: null,
+    types: ['TurboModule'],
+  },
+  'Libraries/ReactNative/UIManager': {
+    default: 'UIManager',
+    types: null,
+  },
+  'Libraries/Animated/useAnimatedValue': {
+    default: 'useAnimatedValue',
+    types: null,
+  },
+  'Libraries/Utilities/useColorScheme': {
+    default: 'useColorScheme',
+    types: null,
+  },
+  'src/private/specs_DEPRECATED/modules/NativeAppearance': {
+    default: null,
+    types: ['ColorSchemeName'],
+  },
+  'Libraries/Utilities/useWindowDimensions': {
+    default: 'useWindowDimensions',
+    types: null,
+  },
+  'Libraries/UTFSequence': {
+    default: 'UTFSequence',
+    types: null,
+  },
+  'Libraries/Vibration/Vibration': {
+    default: 'Vibration',
+    types: null,
+  },
+  'Libraries/Utilities/codegenNativeComponent': {
+    default: 'codegenNativeComponent',
+    types: null,
+  },
+  'Libraries/Utilities/codegenNativeCommands': {
+    default: 'codegenNativeCommands',
+    types: null,
+  },
+  'Libraries/EventEmitter/RCTDeviceEventEmitter': {
+    default: 'DeviceEventEmitter',
+    types: null,
+  },
+  'Libraries/StyleSheet/PlatformColorValueTypesIOS': {
+    default: 'DynamicColorIOS',
+    types: ['DynamicColorIOSTuple'],
+  },
+  'Libraries/EventEmitter/RCTNativeAppEventEmitter': {
+    default: 'NativeAppEventEmitter',
+    types: null,
+  },
+  'Libraries/BatchedBridge/NativeModules': {
+    default: 'NativeModules',
+    types: null,
+  },
+  'Libraries/Utilities/Platform': {
+    default: 'Platform',
+    types: null,
+  },
+  './Libraries/Utilities/PlatformTypes': {
+    default: null,
+    types: ['PlatformOSType', 'PlatformSelectSpec'],
+  },
+  'Libraries/StyleSheet/PlatformColorValueTypes': {
+    default: 'PlatformColor',
+    types: null,
+  },
+  'Libraries/StyleSheet/processColor': {
+    default: 'processColor',
+    types: ['ProcessedColorValue'],
+  },
+  'Libraries/ReactNative/requireNativeComponent': {
+    default: 'requireNativeComponent',
+    types: null,
+  },
+  'Libraries/ReactNative/RootTag': {
+    default: 'RootTagContext',
+    types: ['RootTag'],
+  },
+  'Libraries/Types/RootTagTypes': {
+    default: null,
+    types: ['RootTag'],
+  },
+  'src/private/types/HostInstance': {
+    default: null,
+    types: [
+      'HostInstance',
+      'NativeMethods',
+      'NativeMethodsMixin',
+      'MeasureInWindowOnSuccessCallback',
+      'MeasureLayoutOnSuccessCallback',
+      'MeasureOnSuccessCallback',
+    ],
+  },
+  'src/private/types/HostComponent': {
+    default: null,
+    types: ['HostComponent'],
+  },
+  'Libraries/vendor/core/ErrorUtils': {
+    default: null,
+    types: ['ErrorUtils'],
+  },
+  'Libraries/ReactPrivate/ReactNativePrivateInterface': {
+    default: null,
+    types: ['PublicRootInstance', 'PublicTextInstance'],
+  },
 };
 
 module.exports = {

packages/eslint-plugin-specs/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@react-native/eslint-plugin-specs",
-  "version": "0.80.0-main",
+  "version": "0.81.0-main",
   "description": "ESLint rules to validate NativeModule and Component Specs",
   "license": "MIT",
   "repository": {
@@ -26,14 +26,14 @@
   "dependencies": {
     "@babel/core": "^7.25.2",
     "@babel/plugin-transform-flow-strip-types": "^7.25.2",
-    "@react-native/codegen": "0.80.0-main",
+    "@react-native/codegen": "0.81.0-main",
     "make-dir": "^2.1.0",
     "pirates": "^4.0.1",
     "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.29.1",
+    "hermes-eslint": "0.29.1"
   },
   "engines": {
     "node": ">= 22.14.0"

packages/gradle-plugin/gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

packages/gradle-plugin/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@react-native/gradle-plugin",
-  "version": "0.80.0-main",
+  "version": "0.81.0-main",
   "description": "Gradle Plugin for React Native",
   "license": "MIT",
   "repository": {

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

@@ -70,6 +70,7 @@ abstract class GenerateEntryPointTask : DefaultTask() {
       
       import com.facebook.react.defaults.DefaultNewArchitectureEntryPoint;
       import com.facebook.react.common.annotations.internal.LegacyArchitectureLogger;
+      import com.facebook.react.views.view.WindowUtilKt;
       import com.facebook.react.soloader.OpenSourceMergedSoMapping;
       import com.facebook.soloader.SoLoader;
       
@@ -93,6 +94,10 @@ abstract class GenerateEntryPointTask : DefaultTask() {
           if ({{packageName}}.BuildConfig.IS_NEW_ARCHITECTURE_ENABLED) {
             DefaultNewArchitectureEntryPoint.load();
           }
+          
+          if ({{packageName}}.BuildConfig.IS_EDGE_TO_EDGE_ENABLED) {
+            WindowUtilKt.setEdgeToEdgeFeatureFlagOn();
+          }
         }
       }
             """

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

@@ -148,6 +148,7 @@ abstract class GeneratePackageListTask : DefaultTask() {
             
             {{ packageImports }}
             
+            @SuppressWarnings("deprecation")
             public class PackageList {
               private Application application;
               private ReactNativeHost reactNativeHost;

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

@@ -11,6 +11,7 @@ import com.android.build.api.variant.ApplicationAndroidComponentsExtension
 import com.android.build.api.variant.LibraryAndroidComponentsExtension
 import com.android.build.gradle.LibraryExtension
 import com.facebook.react.ReactExtension
+import com.facebook.react.utils.ProjectUtils.isEdgeToEdgeEnabled
 import com.facebook.react.utils.ProjectUtils.isHermesEnabled
 import com.facebook.react.utils.ProjectUtils.isNewArchEnabled
 import java.io.File
@@ -39,6 +40,8 @@ internal object AgpConfiguratorUtils {
                     project.isNewArchEnabled(extension).toString())
                 ext.defaultConfig.buildConfigField(
                     "boolean", "IS_HERMES_ENABLED", project.isHermesEnabled.toString())
+                ext.defaultConfig.buildConfigField(
+                    "boolean", "IS_EDGE_TO_EDGE_ENABLED", project.isEdgeToEdgeEnabled.toString())
               }
         }
     project.pluginManager.withPlugin("com.android.application", action)

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

@@ -8,12 +8,14 @@
 package com.facebook.react.utils
 
 import com.facebook.react.utils.PropertyUtils.DEFAULT_INTERNAL_PUBLISHING_GROUP
+import com.facebook.react.utils.PropertyUtils.EXCLUSIVE_ENTEPRISE_REPOSITORY
 import com.facebook.react.utils.PropertyUtils.INCLUDE_JITPACK_REPOSITORY
 import com.facebook.react.utils.PropertyUtils.INCLUDE_JITPACK_REPOSITORY_DEFAULT
 import com.facebook.react.utils.PropertyUtils.INTERNAL_PUBLISHING_GROUP
 import com.facebook.react.utils.PropertyUtils.INTERNAL_REACT_NATIVE_MAVEN_LOCAL_REPO
 import com.facebook.react.utils.PropertyUtils.INTERNAL_USE_HERMES_NIGHTLY
 import com.facebook.react.utils.PropertyUtils.INTERNAL_VERSION_NAME
+import com.facebook.react.utils.PropertyUtils.SCOPED_EXCLUSIVE_ENTEPRISE_REPOSITORY
 import com.facebook.react.utils.PropertyUtils.SCOPED_INCLUDE_JITPACK_REPOSITORY
 import java.io.File
 import java.net.URI
@@ -28,6 +30,12 @@ internal object DependencyUtils {
    * party libraries which are auto-linked.
    */
   fun configureRepositories(project: Project) {
+    val exclusiveEnterpriseRepository = project.rootProject.exclusiveEnterpriseRepository()
+    if (exclusiveEnterpriseRepository != null) {
+      project.logger.lifecycle(
+          "Replacing ALL Maven Repositories with: $exclusiveEnterpriseRepository")
+    }
+
     project.rootProject.allprojects { eachProject ->
       with(eachProject) {
         if (hasProperty(INTERNAL_REACT_NATIVE_MAVEN_LOCAL_REPO)) {
@@ -36,6 +44,16 @@ internal object DependencyUtils {
             repo.content { it.excludeGroup("org.webkit") }
           }
         }
+
+        if (exclusiveEnterpriseRepository != null) {
+          // We remove all previously set repositories and only configure the proxy provided by the
+          // user.
+          rootProject.repositories.clear()
+          mavenRepoFromUrl(exclusiveEnterpriseRepository)
+          // We return here as we don't want to configure other repositories as well.
+          return@allprojects
+        }
+
         // We add the snapshot for users on nightlies.
         mavenRepoFromUrl("https://central.sonatype.com/repository/maven-snapshots/") { repo ->
           repo.content { it.excludeGroup("org.webkit") }
@@ -181,4 +199,13 @@ internal object DependencyUtils {
             property(INCLUDE_JITPACK_REPOSITORY).toString().toBoolean()
         else -> INCLUDE_JITPACK_REPOSITORY_DEFAULT
       }
+
+  internal fun Project.exclusiveEnterpriseRepository() =
+      when {
+        hasProperty(SCOPED_EXCLUSIVE_ENTEPRISE_REPOSITORY) ->
+            property(SCOPED_EXCLUSIVE_ENTEPRISE_REPOSITORY).toString()
+        hasProperty(EXCLUSIVE_ENTEPRISE_REPOSITORY) ->
+            property(EXCLUSIVE_ENTEPRISE_REPOSITORY).toString()
+        else -> null
+      }
 }

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

@@ -11,9 +11,11 @@ import com.facebook.react.ReactExtension
 import com.facebook.react.model.ModelPackageJson
 import com.facebook.react.utils.KotlinStdlibCompatUtils.lowercaseCompat
 import com.facebook.react.utils.KotlinStdlibCompatUtils.toBooleanStrictOrNullCompat
+import com.facebook.react.utils.PropertyUtils.EDGE_TO_EDGE_ENABLED
 import com.facebook.react.utils.PropertyUtils.HERMES_ENABLED
 import com.facebook.react.utils.PropertyUtils.NEW_ARCH_ENABLED
 import com.facebook.react.utils.PropertyUtils.REACT_NATIVE_ARCHITECTURES
+import com.facebook.react.utils.PropertyUtils.SCOPED_EDGE_TO_EDGE_ENABLED
 import com.facebook.react.utils.PropertyUtils.SCOPED_HERMES_ENABLED
 import com.facebook.react.utils.PropertyUtils.SCOPED_NEW_ARCH_ENABLED
 import com.facebook.react.utils.PropertyUtils.SCOPED_REACT_NATIVE_ARCHITECTURES
@@ -59,6 +61,13 @@ internal object ProjectUtils {
           HERMES_FALLBACK
         }
 
+  internal val Project.isEdgeToEdgeEnabled: Boolean
+    get() =
+        (project.hasProperty(EDGE_TO_EDGE_ENABLED) &&
+            project.property(EDGE_TO_EDGE_ENABLED).toString().toBoolean()) ||
+            (project.hasProperty(SCOPED_EDGE_TO_EDGE_ENABLED) &&
+                project.property(SCOPED_EDGE_TO_EDGE_ENABLED).toString().toBoolean())
+
   internal val Project.useThirdPartyJSC: Boolean
     get() =
         (project.hasProperty(USE_THIRD_PARTY_JSC) &&

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

@@ -14,10 +14,14 @@ object PropertyUtils {
   const val NEW_ARCH_ENABLED = "newArchEnabled"
   const val SCOPED_NEW_ARCH_ENABLED = "react.newArchEnabled"
 
-  /** Public property that toggles the New Architecture */
+  /** Public property that toggles Hermes */
   const val HERMES_ENABLED = "hermesEnabled"
   const val SCOPED_HERMES_ENABLED = "react.hermesEnabled"
 
+  /** Public property that toggles edge-to-edge */
+  const val EDGE_TO_EDGE_ENABLED = "edgeToEdgeEnabled"
+  const val SCOPED_EDGE_TO_EDGE_ENABLED = "react.edgeToEdgeEnabled"
+
   /** Public property that excludes jsctooling from core */
   const val USE_THIRD_PARTY_JSC = "useThirdPartyJSC"
   const val SCOPED_USE_THIRD_PARTY_JSC = "react.useThirdPartyJSC"
@@ -30,6 +34,12 @@ object PropertyUtils {
   const val INCLUDE_JITPACK_REPOSITORY = "includeJitpackRepository"
   const val SCOPED_INCLUDE_JITPACK_REPOSITORY = "react.includeJitpackRepository"
 
+  /**
+   * Public property that allows to configure an enterprise repository proxy as exclusive repository
+   */
+  const val EXCLUSIVE_ENTEPRISE_REPOSITORY = "exclusiveEnterpriseRepository"
+  const val SCOPED_EXCLUSIVE_ENTEPRISE_REPOSITORY = "react.exclusiveEnterpriseRepository"
+
   /** By default we include JitPack to avoid breaking user builds */
   internal const val INCLUDE_JITPACK_REPOSITORY_DEFAULT = true
 

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

@@ -55,6 +55,7 @@ class GenerateEntryPointTaskTest {
         
         import com.facebook.react.defaults.DefaultNewArchitectureEntryPoint;
         import com.facebook.react.common.annotations.internal.LegacyArchitectureLogger;
+        import com.facebook.react.views.view.WindowUtilKt;
         import com.facebook.react.soloader.OpenSourceMergedSoMapping;
         import com.facebook.soloader.SoLoader;
         
@@ -78,6 +79,10 @@ class GenerateEntryPointTaskTest {
             if (com.facebook.react.BuildConfig.IS_NEW_ARCHITECTURE_ENABLED) {
               DefaultNewArchitectureEntryPoint.load();
             }
+            
+            if (com.facebook.react.BuildConfig.IS_EDGE_TO_EDGE_ENABLED) {
+              WindowUtilKt.setEdgeToEdgeFeatureFlagOn();
+            }
           }
         }
     """

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

@@ -233,6 +233,7 @@ class GeneratePackageListTaskTest {
 
 
 
+    @SuppressWarnings("deprecation")
     public class PackageList {
       private Application application;
       private ReactNativeHost reactNativeHost;
@@ -311,7 +312,8 @@ class GeneratePackageListTaskTest {
     import com.facebook.react.aPackage;
     // @react-native/another-package
     import com.facebook.react.anotherPackage;
-
+    
+    @SuppressWarnings("deprecation")
     public class PackageList {
       private Application application;
       private ReactNativeHost reactNativeHost;

packages/gradle-plugin/react-native-gradle-plugin/src/test/kotlin/com/facebook/react/utils/DependencyUtilsTest.kt

@@ -10,6 +10,7 @@ package com.facebook.react.utils
 import com.facebook.react.tests.createProject
 import com.facebook.react.utils.DependencyUtils.configureDependencies
 import com.facebook.react.utils.DependencyUtils.configureRepositories
+import com.facebook.react.utils.DependencyUtils.exclusiveEnterpriseRepository
 import com.facebook.react.utils.DependencyUtils.getDependencySubstitutions
 import com.facebook.react.utils.DependencyUtils.mavenRepoFromURI
 import com.facebook.react.utils.DependencyUtils.mavenRepoFromUrl
@@ -99,6 +100,24 @@ class DependencyUtilsTest {
         .isNotNull()
   }
 
+  @Test
+  fun configureRepositories_withExclusiveEnterpriseRepository_replacesAllRepositories() {
+    val repositoryURI = URI.create("https://maven.myfabolousorganization.it")
+
+    val project = createProject()
+    project.rootProject.extensions.extraProperties.set(
+        "exclusiveEnterpriseRepository", repositoryURI.toString())
+
+    configureRepositories(project)
+
+    assertThat(project.repositories).hasSize(1)
+    assertThat(
+            project.repositories.firstOrNull {
+              it is MavenArtifactRepository && it.url == repositoryURI
+            })
+        .isNotNull()
+  }
+
   @Test
   fun configureRepositories_withIncludeJitpackRepositoryFalse_doesNotContainJitPack() {
     val repositoryURI = URI.create("https://www.jitpack.io")
@@ -470,7 +489,7 @@ class DependencyUtilsTest {
   @Test
   fun shouldAddJitPack_withUnscopedProperty() {
     val project = createProject(tempFolder.root)
-    project.extensions.extraProperties.set("react.includeJitpackRepository", "false")
+    project.extensions.extraProperties.set("includeJitpackRepository", "false")
     assertThat(project.shouldAddJitPack()).isFalse()
   }
 
@@ -479,4 +498,28 @@ class DependencyUtilsTest {
     val project = createProject(tempFolder.root)
     assertThat(project.shouldAddJitPack()).isTrue()
   }
+
+  @Test
+  fun exclusiveEnterpriseRepository_withScopedProperty() {
+    val project = createProject(tempFolder.root)
+    project.extensions.extraProperties.set(
+        "react.exclusiveEnterpriseRepository", "https://maven.myfabolousorganization.it")
+    assertThat(project.exclusiveEnterpriseRepository())
+        .isEqualTo("https://maven.myfabolousorganization.it")
+  }
+
+  @Test
+  fun exclusiveEnterpriseRepository_withUnscopedProperty() {
+    val project = createProject(tempFolder.root)
+    project.extensions.extraProperties.set(
+        "exclusiveEnterpriseRepository", "https://maven.myfabolousorganization.it")
+    assertThat(project.exclusiveEnterpriseRepository())
+        .isEqualTo("https://maven.myfabolousorganization.it")
+  }
+
+  @Test
+  fun exclusiveEnterpriseRepository_defaultIsTrue() {
+    val project = createProject(tempFolder.root)
+    assertThat(project.exclusiveEnterpriseRepository()).isNull()
+  }
 }

packages/gradle-plugin/react-native-gradle-plugin/src/test/kotlin/com/facebook/react/utils/ProjectUtilsTest.kt

@@ -12,6 +12,7 @@ import com.facebook.react.model.ModelCodegenConfig
 import com.facebook.react.model.ModelPackageJson
 import com.facebook.react.tests.createProject
 import com.facebook.react.utils.ProjectUtils.getReactNativeArchitectures
+import com.facebook.react.utils.ProjectUtils.isEdgeToEdgeEnabled
 import com.facebook.react.utils.ProjectUtils.isHermesEnabled
 import com.facebook.react.utils.ProjectUtils.isNewArchEnabled
 import com.facebook.react.utils.ProjectUtils.needsCodegenFromPackageJson
@@ -98,7 +99,7 @@ class ProjectUtilsTest {
   }
 
   @Test
-  fun isNewArchEnabled_withDisabledViaProperty_returnsFalse() {
+  fun isHermesEnabled_withDisabledViaProperty_returnsFalse() {
     val project = createProject()
     project.extensions.extraProperties.set("hermesEnabled", "false")
     assertThat(project.isHermesEnabled).isFalse()
@@ -150,6 +151,32 @@ class ProjectUtilsTest {
     assertThat(project.isHermesEnabled).isTrue()
   }
 
+  @Test
+  fun isEdgeToEdgeEnabled_returnsFalseByDefault() {
+    assertThat(createProject().isEdgeToEdgeEnabled).isFalse()
+  }
+
+  @Test
+  fun isEdgeToEdgeEnabled_withDisabledViaProperty_returnsFalse() {
+    val project = createProject()
+    project.extensions.extraProperties.set("edgeToEdgeEnabled", "false")
+    assertThat(project.isEdgeToEdgeEnabled).isFalse()
+  }
+
+  @Test
+  fun isEdgeToEdgeEnabled_withEnabledViaProperty_returnsTrue() {
+    val project = createProject()
+    project.extensions.extraProperties.set("edgeToEdgeEnabled", "true")
+    assertThat(project.isEdgeToEdgeEnabled).isTrue()
+  }
+
+  @Test
+  fun isEdgeToEdgeEnabled_withInvalidViaProperty_returnsFalse() {
+    val project = createProject()
+    project.extensions.extraProperties.set("edgeToEdgeEnabled", "¯\\_(ツ)_/¯")
+    assertThat(project.isEdgeToEdgeEnabled).isFalse()
+  }
+
   @Test
   fun needsCodegenFromPackageJson_withCodegenConfigInPackageJson_returnsTrue() {
     val project = createProject()

packages/metro-config/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@react-native/metro-config",
-  "version": "0.80.0-main",
+  "version": "0.81.0-main",
   "description": "Metro configuration for React Native.",
   "license": "MIT",
   "repository": {
@@ -26,9 +26,9 @@
     "dist"
   ],
   "dependencies": {
-    "@react-native/js-polyfills": "0.80.0-main",
-    "@react-native/metro-babel-transformer": "0.80.0-main",
-    "metro-config": "^0.82.4",
-    "metro-runtime": "^0.82.4"
+    "@react-native/js-polyfills": "0.81.0-main",
+    "@react-native/metro-babel-transformer": "0.81.0-main",
+    "metro-config": "^0.82.5",
+    "metro-runtime": "^0.82.5"
   }
 }

packages/metro-config/src/index.flow.js

@@ -43,7 +43,7 @@ const INTERNAL_CALLSITES_REGEX = new RegExp(
 
 export {mergeConfig} from 'metro-config';
 
-let frameworkDefaults = {};
+let frameworkDefaults: InputConfigT = {};
 export function setFrameworkDefaults(config: InputConfigT) {
   frameworkDefaults = config;
 }

packages/metro-config/src/index.js

@@ -13,7 +13,7 @@ export type * from './index.flow';
 */
 
 if (!process.env.BUILD_EXCLUDE_BABEL_REGISTER) {
-  require('../../../scripts/babel-register').registerForMonorepo();
+  require('../../../scripts/shared/babelRegister').registerForMonorepo();
 }
 
 module.exports = require('./index.flow');

packages/new-app-screen/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@react-native/new-app-screen",
-  "version": "0.80.0-main",
+  "version": "0.81.0-main",
   "description": "NewAppScreen component for React Native",
   "keywords": [
     "react-native"

packages/new-app-screen/src/Links.js

@@ -65,7 +65,7 @@ const Links: Array<{
   },
   {
     title: 'Community',
-    description: 'Expore & get help',
+    description: 'Explore & get help',
     url: 'https://reactnative.dev/community/overview',
   },
   {

packages/new-app-screen/src/NewAppScreen.js

@@ -13,10 +13,7 @@ import {ThemedText, useTheme} from './Theme';
 import * as React from 'react';
 import {
   Image,
-  Platform,
-  SafeAreaView,
   ScrollView,
-  StatusBar,
   StyleSheet,
   Text,
   TouchableHighlight,
@@ -29,24 +26,32 @@ import {version as ReactNativeVersion} from 'react-native/Libraries/Core/ReactNa
 
 export type NewAppScreenProps = $ReadOnly<{
   templateFileName?: string,
+  safeAreaInsets?: $ReadOnly<{
+    top: number,
+    bottom: number,
+    left: number,
+    right: number,
+  }>,
 }>;
 
-const statusBarHeightOffset = Platform.select({
-  android: StatusBar.currentHeight || 0,
-  default: 0,
-});
-
 export default function NewAppScreen({
   templateFileName = 'App.tsx',
+  safeAreaInsets = {top: 0, bottom: 0, left: 0, right: 0},
 }: NewAppScreenProps): React.Node {
   const {colors} = useTheme();
   const isDarkMode = useColorScheme() === 'dark';
   const isLargeScreen = useWindowDimensions().width > 600;
 
   return (
-    <SafeAreaView style={{backgroundColor: colors.background}}>
-      <ScrollView>
-        <View style={[styles.container, {paddingTop: statusBarHeightOffset}]}>
+    <View
+      style={{
+        backgroundColor: colors.background,
+        paddingTop: safeAreaInsets.top,
+        paddingLeft: safeAreaInsets.left,
+        paddingRight: safeAreaInsets.right,
+      }}>
+      <ScrollView style={{paddingBottom: safeAreaInsets.bottom}}>
+        <View style={styles.container}>
           <View style={styles.header}>
             <Image
               style={styles.logo}
@@ -99,7 +104,7 @@ export default function NewAppScreen({
           </View>
         </View>
       </ScrollView>
-    </SafeAreaView>
+    </View>
   );
 }
 

packages/new-app-screen/src/index.d.ts

@@ -11,6 +11,14 @@ import type * as React from 'react';
 
 export type NewAppScreenProps = Readonly<{
   templateFileName?: string | undefined;
+  safeAreaInsets?:
+    | Readonly<{
+        top: number;
+        bottom: number;
+        left: number;
+        right: number;
+      }>
+    | undefined;
 }>;
 
 export function NewAppScreen(props: NewAppScreenProps): React.ReactNode;

packages/normalize-color/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@react-native/normalize-colors",
-  "version": "0.80.0-main",
+  "version": "0.81.0-main",
   "description": "Color normalization for React Native.",
   "license": "MIT",
   "repository": {

packages/polyfills/__tests__/console-itest.js

@@ -1,277 +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 strict-local
- * @format
- */
-
-const LOG_LEVELS = {
-  trace: 0,
-  info: 1,
-  warn: 2,
-  error: 3,
-};
-
-describe('console', () => {
-  describe('.table(data, rows)', () => {
-    let originalNativeLoggingHook;
-    let logFn;
-
-    beforeEach(() => {
-      originalNativeLoggingHook = global.nativeLoggingHook;
-      logFn = global.nativeLoggingHook = jest.fn();
-    });
-
-    afterEach(() => {
-      global.nativeLoggingHook = originalNativeLoggingHook;
-    });
-
-    it('should print the passed array as a Markdown table', () => {
-      console.table([
-        {name: 'First', value: 500},
-        {name: 'Second', value: 600},
-        {name: 'Third', value: 700},
-        {name: 'Fourth', value: 800, extraValue: true},
-      ]);
-
-      expect(logFn).toHaveBeenCalledTimes(1);
-      expect(logFn.mock.lastCall).toEqual([
-        `
-| (index) | name     | value | extraValue |
-| ------- | -------- | ----- | ---------- |
-| 0       | 'First'  | 500   |            |
-| 1       | 'Second' | 600   |            |
-| 2       | 'Third'  | 700   |            |
-| 3       | 'Fourth' | 800   | true       |`,
-        LOG_LEVELS.info,
-      ]);
-    });
-
-    it('should print the passed dictionary as a Markdown table', () => {
-      console.table({
-        first: {name: 'First', value: 500},
-        second: {name: 'Second', value: 600},
-        third: {name: 'Third', value: 700},
-        fourth: {name: 'Fourth', value: 800, extraValue: true},
-      });
-
-      expect(logFn).toHaveBeenCalledTimes(1);
-      expect(logFn.mock.lastCall).toEqual([
-        `
-| (index) | name     | value | extraValue |
-| ------- | -------- | ----- | ---------- |
-| first   | 'First'  | 500   |            |
-| second  | 'Second' | 600   |            |
-| third   | 'Third'  | 700   |            |
-| fourth  | 'Fourth' | 800   | true       |`,
-        LOG_LEVELS.info,
-      ]);
-    });
-
-    it('should work with different types of values', () => {
-      console.table([
-        {
-          string: '',
-          number: 0,
-          boolean: true,
-          function: () => {},
-          object: {a: 1, b: 2},
-          null: null,
-          undefined: undefined,
-        },
-        {
-          string: 'a',
-          number: 1,
-          boolean: true,
-          function: () => {},
-          object: {a: 1, b: 2},
-          null: null,
-          undefined: undefined,
-        },
-        {
-          string: 'aa',
-          number: 2,
-          boolean: false,
-          function: () => {},
-          object: {a: 1, b: 2},
-          null: null,
-          undefined: undefined,
-        },
-        {
-          string: 'aaa',
-          number: 3,
-          boolean: false,
-          function: () => {},
-          object: {a: 1, b: 2},
-          null: null,
-          undefined: undefined,
-        },
-      ]);
-
-      expect(logFn).toHaveBeenCalledTimes(1);
-      expect(logFn.mock.lastCall).toEqual([
-        `
-| (index) | string | number | boolean | function | object | null | undefined |
-| ------- | ------ | ------ | ------- | -------- | ------ | ---- | --------- |
-| 0       | ''     | 0      | true    | ƒ        | {…}    | null | undefined |
-| 1       | 'a'    | 1      | true    | ƒ        | {…}    | null | undefined |
-| 2       | 'aa'   | 2      | false   | ƒ        | {…}    | null | undefined |
-| 3       | 'aaa'  | 3      | false   | ƒ        | {…}    | null | undefined |`,
-        LOG_LEVELS.info,
-      ]);
-    });
-
-    it('should print the keys in all the objects', () => {
-      console.table([
-        {name: 'foo'},
-        {name: 'bar', value: 1},
-        {value: 2, surname: 'baz'},
-        {address: 'other'},
-      ]);
-
-      expect(logFn).toHaveBeenCalledTimes(1);
-      expect(logFn.mock.lastCall).toEqual([
-        `
-| (index) | name  | value | surname | address |
-| ------- | ----- | ----- | ------- | ------- |
-| 0       | 'foo' |       |         |         |
-| 1       | 'bar' | 1     |         |         |
-| 2       |       | 2     | 'baz'   |         |
-| 3       |       |       |         | 'other' |`,
-        LOG_LEVELS.info,
-      ]);
-    });
-
-    it('should print an empty string for empty arrays', () => {
-      console.table([]);
-
-      expect(logFn).toHaveBeenCalledTimes(1);
-      expect(logFn.mock.lastCall).toEqual([``, LOG_LEVELS.info]);
-    });
-
-    it('should print an empty string for empty dictionaries', () => {
-      console.table({});
-
-      expect(logFn).toHaveBeenCalledTimes(1);
-      expect(logFn.mock.lastCall).toEqual([``, LOG_LEVELS.info]);
-    });
-
-    // This test is currently failing
-    it('should print an indices table for an array of empty objects', () => {
-      console.table([{}, {}, {}, {}]);
-
-      expect(logFn).toHaveBeenCalledTimes(1);
-      expect(logFn.mock.lastCall).toEqual([
-        `
-| (index) |
-| ------- |
-| 0       |
-| 1       |
-| 2       |
-| 3       |`,
-        LOG_LEVELS.info,
-      ]);
-    });
-
-    it('should print an indices table for a dictionary of empty objects', () => {
-      console.table({
-        first: {},
-        second: {},
-        third: {},
-        fourth: {},
-      });
-
-      expect(logFn).toHaveBeenCalledTimes(1);
-      expect(logFn.mock.lastCall).toEqual([
-        `
-| (index) |
-| ------- |
-| first   |
-| second  |
-| third   |
-| fourth  |`,
-        LOG_LEVELS.info,
-      ]);
-    });
-
-    it('should not modify the logged value', () => {
-      global.nativeLoggingHook = jest.fn();
-
-      const array = [
-        {name: 'First', value: 500},
-        {name: 'Second', value: 600},
-        {name: 'Third', value: 700},
-        {name: 'Fourth', value: 800, extraValue: true},
-      ];
-      const originalArrayValue = JSON.parse(JSON.stringify(array));
-
-      console.table(array);
-
-      expect(array).toEqual(originalArrayValue);
-
-      const object = {
-        first: {name: 'First', value: 500},
-        second: {name: 'Second', value: 600},
-        third: {name: 'Third', value: 700},
-        fourth: {name: 'Fourth', value: 800, extraValue: true},
-      };
-
-      const originalObjectValue = JSON.parse(JSON.stringify(object));
-
-      console.table(object);
-
-      expect(object).toEqual(originalObjectValue);
-    });
-
-    it('should only print the selected columns, if specified (arrays)', () => {
-      console.table(
-        [
-          {first: 1, second: 2, third: 3},
-          {first: 4, second: 5},
-          {third: 7, fourth: 8},
-          {fifth: 9},
-        ],
-        // $FlowExpectedError[extra-arg]
-        ['first', 'fifth'],
-      );
-      expect(logFn).toHaveBeenCalledTimes(1);
-      expect(logFn.mock.lastCall).toEqual([
-        `
-| (index) | first | fifth |
-| ------- | ----- | ----- |
-| 0       | 1     |       |
-| 1       | 4     |       |
-| 2       |       |       |
-| 3       |       | 9     |`,
-        LOG_LEVELS.info,
-      ]);
-    });
-
-    it('should only print the selected columns, if specified (dictionaries)', () => {
-      console.table(
-        {
-          a: {first: 1, second: 2, third: 3},
-          b: {first: 4, second: 5},
-          c: {third: 7, fourth: 8},
-          d: {fifth: 9},
-        },
-        // $FlowExpectedError[extra-arg]
-        ['first', 'fifth'],
-      );
-      expect(logFn).toHaveBeenCalledTimes(1);
-      expect(logFn.mock.lastCall).toEqual([
-        `
-| (index) | first | fifth |
-| ------- | ----- | ----- |
-| a       | 1     |       |
-| b       | 4     |       |
-| c       |       |       |
-| d       |       | 9     |`,
-        LOG_LEVELS.info,
-      ]);
-    });
-  });
-});

packages/polyfills/__tests__/consoleTable-itest.js

@@ -0,0 +1,275 @@
+/**
+ * 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
+ */
+
+const LOG_LEVELS = {
+  trace: 0,
+  info: 1,
+  warn: 2,
+  error: 3,
+};
+
+describe('console.table(data, rows)', () => {
+  let originalNativeLoggingHook;
+  let logFn;
+
+  beforeEach(() => {
+    originalNativeLoggingHook = global.nativeLoggingHook;
+    logFn = global.nativeLoggingHook = jest.fn();
+  });
+
+  afterEach(() => {
+    global.nativeLoggingHook = originalNativeLoggingHook;
+  });
+
+  it('should print the passed array as a Markdown table', () => {
+    console.table([
+      {name: 'First', value: 500},
+      {name: 'Second', value: 600},
+      {name: 'Third', value: 700},
+      {name: 'Fourth', value: 800, extraValue: true},
+    ]);
+
+    expect(logFn).toHaveBeenCalledTimes(1);
+    expect(logFn.mock.lastCall).toEqual([
+      `
+| (index) | name     | value | extraValue |
+| ------- | -------- | ----- | ---------- |
+| 0       | 'First'  | 500   |            |
+| 1       | 'Second' | 600   |            |
+| 2       | 'Third'  | 700   |            |
+| 3       | 'Fourth' | 800   | true       |`,
+      LOG_LEVELS.info,
+    ]);
+  });
+
+  it('should print the passed dictionary as a Markdown table', () => {
+    console.table({
+      first: {name: 'First', value: 500},
+      second: {name: 'Second', value: 600},
+      third: {name: 'Third', value: 700},
+      fourth: {name: 'Fourth', value: 800, extraValue: true},
+    });
+
+    expect(logFn).toHaveBeenCalledTimes(1);
+    expect(logFn.mock.lastCall).toEqual([
+      `
+| (index) | name     | value | extraValue |
+| ------- | -------- | ----- | ---------- |
+| first   | 'First'  | 500   |            |
+| second  | 'Second' | 600   |            |
+| third   | 'Third'  | 700   |            |
+| fourth  | 'Fourth' | 800   | true       |`,
+      LOG_LEVELS.info,
+    ]);
+  });
+
+  it('should work with different types of values', () => {
+    console.table([
+      {
+        string: '',
+        number: 0,
+        boolean: true,
+        function: () => {},
+        object: {a: 1, b: 2},
+        null: null,
+        undefined: undefined,
+      },
+      {
+        string: 'a',
+        number: 1,
+        boolean: true,
+        function: () => {},
+        object: {a: 1, b: 2},
+        null: null,
+        undefined: undefined,
+      },
+      {
+        string: 'aa',
+        number: 2,
+        boolean: false,
+        function: () => {},
+        object: {a: 1, b: 2},
+        null: null,
+        undefined: undefined,
+      },
+      {
+        string: 'aaa',
+        number: 3,
+        boolean: false,
+        function: () => {},
+        object: {a: 1, b: 2},
+        null: null,
+        undefined: undefined,
+      },
+    ]);
+
+    expect(logFn).toHaveBeenCalledTimes(1);
+    expect(logFn.mock.lastCall).toEqual([
+      `
+| (index) | string | number | boolean | function | object | null | undefined |
+| ------- | ------ | ------ | ------- | -------- | ------ | ---- | --------- |
+| 0       | ''     | 0      | true    | ƒ        | {…}    | null | undefined |
+| 1       | 'a'    | 1      | true    | ƒ        | {…}    | null | undefined |
+| 2       | 'aa'   | 2      | false   | ƒ        | {…}    | null | undefined |
+| 3       | 'aaa'  | 3      | false   | ƒ        | {…}    | null | undefined |`,
+      LOG_LEVELS.info,
+    ]);
+  });
+
+  it('should print the keys in all the objects', () => {
+    console.table([
+      {name: 'foo'},
+      {name: 'bar', value: 1},
+      {value: 2, surname: 'baz'},
+      {address: 'other'},
+    ]);
+
+    expect(logFn).toHaveBeenCalledTimes(1);
+    expect(logFn.mock.lastCall).toEqual([
+      `
+| (index) | name  | value | surname | address |
+| ------- | ----- | ----- | ------- | ------- |
+| 0       | 'foo' |       |         |         |
+| 1       | 'bar' | 1     |         |         |
+| 2       |       | 2     | 'baz'   |         |
+| 3       |       |       |         | 'other' |`,
+      LOG_LEVELS.info,
+    ]);
+  });
+
+  it('should print an empty string for empty arrays', () => {
+    console.table([]);
+
+    expect(logFn).toHaveBeenCalledTimes(1);
+    expect(logFn.mock.lastCall).toEqual([``, LOG_LEVELS.info]);
+  });
+
+  it('should print an empty string for empty dictionaries', () => {
+    console.table({});
+
+    expect(logFn).toHaveBeenCalledTimes(1);
+    expect(logFn.mock.lastCall).toEqual([``, LOG_LEVELS.info]);
+  });
+
+  // This test is currently failing
+  it('should print an indices table for an array of empty objects', () => {
+    console.table([{}, {}, {}, {}]);
+
+    expect(logFn).toHaveBeenCalledTimes(1);
+    expect(logFn.mock.lastCall).toEqual([
+      `
+| (index) |
+| ------- |
+| 0       |
+| 1       |
+| 2       |
+| 3       |`,
+      LOG_LEVELS.info,
+    ]);
+  });
+
+  it('should print an indices table for a dictionary of empty objects', () => {
+    console.table({
+      first: {},
+      second: {},
+      third: {},
+      fourth: {},
+    });
+
+    expect(logFn).toHaveBeenCalledTimes(1);
+    expect(logFn.mock.lastCall).toEqual([
+      `
+| (index) |
+| ------- |
+| first   |
+| second  |
+| third   |
+| fourth  |`,
+      LOG_LEVELS.info,
+    ]);
+  });
+
+  it('should not modify the logged value', () => {
+    global.nativeLoggingHook = jest.fn();
+
+    const array = [
+      {name: 'First', value: 500},
+      {name: 'Second', value: 600},
+      {name: 'Third', value: 700},
+      {name: 'Fourth', value: 800, extraValue: true},
+    ];
+    const originalArrayValue = JSON.parse(JSON.stringify(array));
+
+    console.table(array);
+
+    expect(array).toEqual(originalArrayValue);
+
+    const object = {
+      first: {name: 'First', value: 500},
+      second: {name: 'Second', value: 600},
+      third: {name: 'Third', value: 700},
+      fourth: {name: 'Fourth', value: 800, extraValue: true},
+    };
+
+    const originalObjectValue = JSON.parse(JSON.stringify(object));
+
+    console.table(object);
+
+    expect(object).toEqual(originalObjectValue);
+  });
+
+  it('should only print the selected columns, if specified (arrays)', () => {
+    console.table(
+      [
+        {first: 1, second: 2, third: 3},
+        {first: 4, second: 5},
+        {third: 7, fourth: 8},
+        {fifth: 9},
+      ],
+      // $FlowExpectedError[extra-arg]
+      ['first', 'fifth'],
+    );
+    expect(logFn).toHaveBeenCalledTimes(1);
+    expect(logFn.mock.lastCall).toEqual([
+      `
+| (index) | first | fifth |
+| ------- | ----- | ----- |
+| 0       | 1     |       |
+| 1       | 4     |       |
+| 2       |       |       |
+| 3       |       | 9     |`,
+      LOG_LEVELS.info,
+    ]);
+  });
+
+  it('should only print the selected columns, if specified (dictionaries)', () => {
+    console.table(
+      {
+        a: {first: 1, second: 2, third: 3},
+        b: {first: 4, second: 5},
+        c: {third: 7, fourth: 8},
+        d: {fifth: 9},
+      },
+      // $FlowExpectedError[extra-arg]
+      ['first', 'fifth'],
+    );
+    expect(logFn).toHaveBeenCalledTimes(1);
+    expect(logFn.mock.lastCall).toEqual([
+      `
+| (index) | first | fifth |
+| ------- | ----- | ----- |
+| a       | 1     |       |
+| b       | 4     |       |
+| c       |       |       |
+| d       |       | 9     |`,
+      LOG_LEVELS.info,
+    ]);
+  });
+});

packages/polyfills/__tests__/consoleTimeStamp-itest.js

@@ -0,0 +1,41 @@
+/**
+ * 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
+ * @fantom_mode *
+ * @fantom_flags fuseboxEnabledRelease:*
+ */
+
+describe('console.timeStamp()', () => {
+  it('installed', () => {
+    expect(typeof console.timeStamp).toBe('function');
+  });
+
+  it("doesn't throw when label is not specified", () => {
+    expect(() => console.timeStamp()).not.toThrow();
+  });
+
+  it("doesn't throw when label is specified", () => {
+    expect(() => console.timeStamp('label')).not.toThrow();
+  });
+
+  it("doesn't throw when additional arguments are specified", () => {
+    expect(() =>
+      // $FlowExpectedError[extra-arg]
+      console.timeStamp('label', 100, 500, 'Track', 'Group', 'error'),
+    ).not.toThrow();
+  });
+
+  it("doesn't throw when invalid arguments are specified", () => {
+    // $FlowExpectedError[incompatible-call]
+    expect(() => console.timeStamp({})).not.toThrow();
+    expect(() =>
+      // $FlowExpectedError[extra-arg]
+      console.timeStamp('label', true, null, {}, [], () => {}),
+    ).not.toThrow();
+  });
+});

packages/polyfills/console.js

@@ -569,6 +569,11 @@ function consoleAssertPolyfill(expression, label) {
   }
 }
 
+// https://developer.mozilla.org/en-US/docs/Web/API/console/timeStamp_static.
+// Non-standard API for recording markers on a timeline of the Performance instrumentation.
+// The actual logging is not provided by definition.
+function consoleTimeStampPolyfill() {}
+
 if (global.nativeLoggingHook) {
   const originalConsole = global.console;
   // Preserve the original `console` as `originalConsole`
@@ -580,6 +585,7 @@ if (global.nativeLoggingHook) {
   }
 
   global.console = {
+    timeStamp: consoleTimeStampPolyfill,
     ...(originalConsole ?? {}),
     error: getNativeLogFunction(LOG_LEVELS.error),
     info: getNativeLogFunction(LOG_LEVELS.info),
@@ -694,6 +700,7 @@ if (global.nativeLoggingHook) {
     profile: stub,
     profileEnd: stub,
     table: stub,
+    timeStamp: stub,
   };
 
   Object.defineProperty(console, '_isPolyfilled', {

packages/polyfills/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@react-native/js-polyfills",
-  "version": "0.80.0-main",
+  "version": "0.81.0-main",
   "description": "Polyfills for React Native.",
   "license": "MIT",
   "repository": {

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

@@ -1,6 +1,6 @@
 {
   "name": "@react-native/babel-preset",
-  "version": "0.80.0-main",
+  "version": "0.81.0-main",
   "description": "Babel preset for React Native applications",
   "repository": {
     "type": "git",
@@ -66,8 +66,8 @@
     "@babel/plugin-transform-typescript": "^7.25.2",
     "@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",
+    "@react-native/babel-plugin-codegen": "0.81.0-main",
+    "babel-plugin-syntax-hermes-parser": "0.29.1",
     "babel-plugin-transform-flow-enums": "^0.0.2",
     "react-refresh": "^0.14.0"
   },

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

@@ -1,6 +1,6 @@
 {
   "name": "@react-native/metro-babel-transformer",
-  "version": "0.80.0-main",
+  "version": "0.81.0-main",
   "description": "Babel transformer for React Native applications.",
   "repository": {
     "type": "git",
@@ -27,8 +27,8 @@
   ],
   "dependencies": {
     "@babel/core": "^7.25.2",
-    "@react-native/babel-preset": "0.80.0-main",
-    "hermes-parser": "0.29.0",
+    "@react-native/babel-preset": "0.81.0-main",
+    "hermes-parser": "0.29.1",
     "nullthrows": "^1.1.1"
   },
   "peerDependencies": {

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

@@ -40,6 +40,10 @@ 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();
@@ -51,18 +55,57 @@ 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
@@ -99,6 +142,10 @@ 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();
@@ -152,6 +199,10 @@ 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();
@@ -202,6 +253,10 @@ 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();
@@ -213,6 +268,9 @@ folly::dynamic DimensionPropNativeComponentViewProps::getDiffProps(
   }
   folly::dynamic result = HostPlatformViewProps::getDiffProps(prevProps);
   
+  if (marginBack != oldProps->marginBack) {
+    result[\\"marginBack\\"] = toDynamic(marginBack);
+  }
   return result;
 }
 #endif
@@ -248,6 +306,10 @@ 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();
@@ -295,6 +357,10 @@ 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();
@@ -306,7 +372,13 @@ 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
@@ -342,6 +414,10 @@ 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();
@@ -391,6 +467,10 @@ 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();
@@ -446,6 +526,10 @@ 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();
@@ -520,6 +604,10 @@ 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();
@@ -532,7 +620,7 @@ folly::dynamic ImagePropNativeComponentViewProps::getDiffProps(
   folly::dynamic result = HostPlatformViewProps::getDiffProps(prevProps);
   
   if (thumbImage != oldProps->thumbImage) {
-    result[\\"thumbImage\\"] = thumbImage.toDynamic();
+    result[\\"thumbImage\\"] = toDynamic(thumbImage);
   }
   return result;
 }
@@ -571,6 +659,10 @@ 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();
@@ -628,6 +720,10 @@ 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();
@@ -678,6 +774,10 @@ 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();
@@ -689,6 +789,9 @@ folly::dynamic MixedPropNativeComponentViewProps::getDiffProps(
   }
   folly::dynamic result = HostPlatformViewProps::getDiffProps(prevProps);
   
+  if (mixedProp != oldProps->mixedProp) {
+    result[\\"mixedProp\\"] = mixedProp;
+  }
   return result;
 }
 #endif
@@ -728,6 +831,10 @@ 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();
@@ -740,7 +847,7 @@ folly::dynamic MultiNativePropNativeComponentViewProps::getDiffProps(
   folly::dynamic result = HostPlatformViewProps::getDiffProps(prevProps);
   
   if (thumbImage != oldProps->thumbImage) {
-    result[\\"thumbImage\\"] = thumbImage.toDynamic();
+    result[\\"thumbImage\\"] = toDynamic(thumbImage);
   }
     
   if (color != oldProps->color) {
@@ -752,10 +859,7 @@ folly::dynamic MultiNativePropNativeComponentViewProps::getDiffProps(
   }
     
   if (point != oldProps->point) {
-    folly::dynamic pointResult = folly::dynamic::object();
-    pointResult[\\"x\\"] = point.x;
-    pointResult[\\"y\\"] = point.y;
-    result[\\"point\\"] = pointResult;
+    result[\\"point\\"] = toDynamic(point);
   }
   return result;
 }
@@ -792,6 +896,10 @@ 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();
@@ -841,6 +949,10 @@ 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();
@@ -852,8 +964,17 @@ 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
@@ -889,6 +1010,10 @@ 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();
@@ -901,10 +1026,7 @@ folly::dynamic PointPropNativeComponentViewProps::getDiffProps(
   folly::dynamic result = HostPlatformViewProps::getDiffProps(prevProps);
   
   if (startPoint != oldProps->startPoint) {
-    folly::dynamic pointResult = folly::dynamic::object();
-    pointResult[\\"x\\"] = startPoint.x;
-    pointResult[\\"y\\"] = startPoint.y;
-    result[\\"startPoint\\"] = pointResult;
+    result[\\"startPoint\\"] = toDynamic(startPoint);
   }
   return result;
 }
@@ -942,6 +1064,10 @@ 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,6 +16,7 @@ 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>
@@ -87,6 +88,16 @@ 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) {
@@ -102,6 +113,12 @@ 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) {
@@ -115,6 +132,17 @@ 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) {
@@ -134,6 +162,12 @@ 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) {
@@ -165,6 +199,8 @@ 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
 };
@@ -203,6 +239,8 @@ class BooleanPropNativeComponentViewProps final : public ViewProps {
   bool disabledNullable{};
 
   #ifdef RN_SERIALIZABLE_STATE
+  ComponentName getDiffPropsImplementationTarget() const override;
+
   folly::dynamic getDiffProps(const Props* prevProps) const override;
   #endif
 };
@@ -241,6 +279,8 @@ class ColorPropNativeComponentViewProps final : public ViewProps {
   SharedColor tintColor{};
 
   #ifdef RN_SERIALIZABLE_STATE
+  ComponentName getDiffPropsImplementationTarget() const override;
+
   folly::dynamic getDiffProps(const Props* prevProps) const override;
   #endif
 };
@@ -265,6 +305,7 @@ 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 {
@@ -279,6 +320,8 @@ class DimensionPropNativeComponentViewProps final : public ViewProps {
   YGValue marginBack{};
 
   #ifdef RN_SERIALIZABLE_STATE
+  ComponentName getDiffPropsImplementationTarget() const override;
+
   folly::dynamic getDiffProps(const Props* prevProps) const override;
   #endif
 };
@@ -316,6 +359,8 @@ class EdgeInsetsPropNativeComponentViewProps final : public ViewProps {
   
 
   #ifdef RN_SERIALIZABLE_STATE
+  ComponentName getDiffPropsImplementationTarget() const override;
+
   folly::dynamic getDiffProps(const Props* prevProps) const override;
   #endif
 };
@@ -360,6 +405,12 @@ 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) {
@@ -391,6 +442,17 @@ 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;
@@ -402,6 +464,8 @@ 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
 };
@@ -439,6 +503,8 @@ 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
 };
@@ -476,6 +542,8 @@ 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
 };
@@ -519,6 +587,8 @@ class FloatPropsNativeComponentViewProps final : public ViewProps {
   Float blurRadiusNullable{};
 
   #ifdef RN_SERIALIZABLE_STATE
+  ComponentName getDiffPropsImplementationTarget() const override;
+
   folly::dynamic getDiffProps(const Props* prevProps) const override;
   #endif
 };
@@ -557,6 +627,8 @@ class ImagePropNativeComponentViewProps final : public ViewProps {
   ImageSource thumbImage{};
 
   #ifdef RN_SERIALIZABLE_STATE
+  ComponentName getDiffPropsImplementationTarget() const override;
+
   folly::dynamic getDiffProps(const Props* prevProps) const override;
   #endif
 };
@@ -596,6 +668,8 @@ 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
 };
@@ -633,6 +707,8 @@ 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
 };
@@ -670,6 +746,8 @@ 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
 };
@@ -713,6 +791,8 @@ class MultiNativePropNativeComponentViewProps final : public ViewProps {
   Point point{};
 
   #ifdef RN_SERIALIZABLE_STATE
+  ComponentName getDiffPropsImplementationTarget() const override;
+
   folly::dynamic getDiffProps(const Props* prevProps) const override;
   #endif
 };
@@ -750,6 +830,8 @@ class NoPropsNoEventsNativeComponentViewProps final : public ViewProps {
   
 
   #ifdef RN_SERIALIZABLE_STATE
+  ComponentName getDiffPropsImplementationTarget() const override;
+
   folly::dynamic getDiffProps(const Props* prevProps) const override;
   #endif
 };
@@ -798,6 +880,12 @@ 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) {
@@ -820,6 +908,15 @@ 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};
@@ -827,6 +924,21 @@ 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) {
@@ -862,8 +974,24 @@ 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) {
@@ -879,10 +1007,28 @@ 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) {
@@ -905,6 +1051,12 @@ 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;
@@ -917,6 +1069,8 @@ class ObjectPropsNativeComponentProps final : public ViewProps {
   ObjectPropsNativeComponentObjectPrimitiveRequiredPropStruct objectPrimitiveRequiredProp{};
 
   #ifdef RN_SERIALIZABLE_STATE
+  ComponentName getDiffPropsImplementationTarget() const override;
+
   folly::dynamic getDiffProps(const Props* prevProps) const override;
   #endif
 };
@@ -955,6 +1109,8 @@ class PointPropNativeComponentViewProps final : public ViewProps {
   Point startPoint{};
 
   #ifdef RN_SERIALIZABLE_STATE
+  ComponentName getDiffPropsImplementationTarget() const override;
+
   folly::dynamic getDiffProps(const Props* prevProps) const override;
   #endif
 };
@@ -993,6 +1149,8 @@ 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,6 +40,10 @@ 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();
@@ -51,18 +55,57 @@ 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
@@ -99,6 +142,10 @@ 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();
@@ -152,6 +199,10 @@ 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();
@@ -202,6 +253,10 @@ 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();
@@ -213,6 +268,9 @@ folly::dynamic DimensionPropNativeComponentViewProps::getDiffProps(
   }
   folly::dynamic result = HostPlatformViewProps::getDiffProps(prevProps);
   
+  if (marginBack != oldProps->marginBack) {
+    result[\\"marginBack\\"] = toDynamic(marginBack);
+  }
   return result;
 }
 #endif
@@ -248,6 +306,10 @@ 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();
@@ -295,6 +357,10 @@ 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();
@@ -306,7 +372,13 @@ 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
@@ -342,6 +414,10 @@ 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();
@@ -391,6 +467,10 @@ 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();
@@ -446,6 +526,10 @@ 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();
@@ -520,6 +604,10 @@ 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();
@@ -532,7 +620,7 @@ folly::dynamic ImagePropNativeComponentViewProps::getDiffProps(
   folly::dynamic result = HostPlatformViewProps::getDiffProps(prevProps);
   
   if (thumbImage != oldProps->thumbImage) {
-    result[\\"thumbImage\\"] = thumbImage.toDynamic();
+    result[\\"thumbImage\\"] = toDynamic(thumbImage);
   }
   return result;
 }
@@ -571,6 +659,10 @@ 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();
@@ -628,6 +720,10 @@ 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();
@@ -678,6 +774,10 @@ 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();
@@ -689,6 +789,9 @@ folly::dynamic MixedPropNativeComponentViewProps::getDiffProps(
   }
   folly::dynamic result = HostPlatformViewProps::getDiffProps(prevProps);
   
+  if (mixedProp != oldProps->mixedProp) {
+    result[\\"mixedProp\\"] = mixedProp;
+  }
   return result;
 }
 #endif
@@ -728,6 +831,10 @@ 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();
@@ -740,7 +847,7 @@ folly::dynamic MultiNativePropNativeComponentViewProps::getDiffProps(
   folly::dynamic result = HostPlatformViewProps::getDiffProps(prevProps);
   
   if (thumbImage != oldProps->thumbImage) {
-    result[\\"thumbImage\\"] = thumbImage.toDynamic();
+    result[\\"thumbImage\\"] = toDynamic(thumbImage);
   }
     
   if (color != oldProps->color) {
@@ -752,10 +859,7 @@ folly::dynamic MultiNativePropNativeComponentViewProps::getDiffProps(
   }
     
   if (point != oldProps->point) {
-    folly::dynamic pointResult = folly::dynamic::object();
-    pointResult[\\"x\\"] = point.x;
-    pointResult[\\"y\\"] = point.y;
-    result[\\"point\\"] = pointResult;
+    result[\\"point\\"] = toDynamic(point);
   }
   return result;
 }
@@ -792,6 +896,10 @@ 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();
@@ -841,6 +949,10 @@ 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();
@@ -852,8 +964,17 @@ 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
@@ -889,6 +1010,10 @@ 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();
@@ -901,10 +1026,7 @@ folly::dynamic PointPropNativeComponentViewProps::getDiffProps(
   folly::dynamic result = HostPlatformViewProps::getDiffProps(prevProps);
   
   if (startPoint != oldProps->startPoint) {
-    folly::dynamic pointResult = folly::dynamic::object();
-    pointResult[\\"x\\"] = startPoint.x;
-    pointResult[\\"y\\"] = startPoint.y;
-    result[\\"startPoint\\"] = pointResult;
+    result[\\"startPoint\\"] = toDynamic(startPoint);
   }
   return result;
 }
@@ -942,6 +1064,10 @@ 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,6 +16,7 @@ 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>
@@ -87,6 +88,16 @@ 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) {
@@ -102,6 +113,12 @@ 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) {
@@ -115,6 +132,17 @@ 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) {
@@ -134,6 +162,12 @@ 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) {
@@ -165,6 +199,8 @@ 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
 };
@@ -203,6 +239,8 @@ class BooleanPropNativeComponentViewProps final : public ViewProps {
   bool disabledNullable{};
 
   #ifdef RN_SERIALIZABLE_STATE
+  ComponentName getDiffPropsImplementationTarget() const override;
+
   folly::dynamic getDiffProps(const Props* prevProps) const override;
   #endif
 };
@@ -241,6 +279,8 @@ class ColorPropNativeComponentViewProps final : public ViewProps {
   SharedColor tintColor{};
 
   #ifdef RN_SERIALIZABLE_STATE
+  ComponentName getDiffPropsImplementationTarget() const override;
+
   folly::dynamic getDiffProps(const Props* prevProps) const override;
   #endif
 };
@@ -265,6 +305,7 @@ 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 {
@@ -279,6 +320,8 @@ class DimensionPropNativeComponentViewProps final : public ViewProps {
   YGValue marginBack{};
 
   #ifdef RN_SERIALIZABLE_STATE
+  ComponentName getDiffPropsImplementationTarget() const override;
+
   folly::dynamic getDiffProps(const Props* prevProps) const override;
   #endif
 };
@@ -316,6 +359,8 @@ class EdgeInsetsPropNativeComponentViewProps final : public ViewProps {
   
 
   #ifdef RN_SERIALIZABLE_STATE
+  ComponentName getDiffPropsImplementationTarget() const override;
+
   folly::dynamic getDiffProps(const Props* prevProps) const override;
   #endif
 };
@@ -360,6 +405,12 @@ 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) {
@@ -391,6 +442,17 @@ 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;
@@ -402,6 +464,8 @@ 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
 };
@@ -439,6 +503,8 @@ 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
 };
@@ -476,6 +542,8 @@ 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
 };
@@ -519,6 +587,8 @@ class FloatPropsNativeComponentViewProps final : public ViewProps {
   Float blurRadiusNullable{};
 
   #ifdef RN_SERIALIZABLE_STATE
+  ComponentName getDiffPropsImplementationTarget() const override;
+
   folly::dynamic getDiffProps(const Props* prevProps) const override;
   #endif
 };
@@ -557,6 +627,8 @@ class ImagePropNativeComponentViewProps final : public ViewProps {
   ImageSource thumbImage{};
 
   #ifdef RN_SERIALIZABLE_STATE
+  ComponentName getDiffPropsImplementationTarget() const override;
+
   folly::dynamic getDiffProps(const Props* prevProps) const override;
   #endif
 };
@@ -596,6 +668,8 @@ 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
 };
@@ -633,6 +707,8 @@ 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
 };
@@ -670,6 +746,8 @@ 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
 };
@@ -713,6 +791,8 @@ class MultiNativePropNativeComponentViewProps final : public ViewProps {
   Point point{};
 
   #ifdef RN_SERIALIZABLE_STATE
+  ComponentName getDiffPropsImplementationTarget() const override;
+
   folly::dynamic getDiffProps(const Props* prevProps) const override;
   #endif
 };
@@ -750,6 +830,8 @@ class NoPropsNoEventsNativeComponentViewProps final : public ViewProps {
   
 
   #ifdef RN_SERIALIZABLE_STATE
+  ComponentName getDiffPropsImplementationTarget() const override;
+
   folly::dynamic getDiffProps(const Props* prevProps) const override;
   #endif
 };
@@ -798,6 +880,12 @@ 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) {
@@ -820,6 +908,15 @@ 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};
@@ -827,6 +924,21 @@ 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) {
@@ -862,8 +974,24 @@ 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) {
@@ -879,10 +1007,28 @@ 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) {
@@ -905,6 +1051,12 @@ 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;
@@ -917,6 +1069,8 @@ class ObjectPropsNativeComponentProps final : public ViewProps {
   ObjectPropsNativeComponentObjectPrimitiveRequiredPropStruct objectPrimitiveRequiredProp{};
 
   #ifdef RN_SERIALIZABLE_STATE
+  ComponentName getDiffPropsImplementationTarget() const override;
+
   folly::dynamic getDiffProps(const Props* prevProps) const override;
   #endif
 };
@@ -955,6 +1109,8 @@ class PointPropNativeComponentViewProps final : public ViewProps {
   Point startPoint{};
 
   #ifdef RN_SERIALIZABLE_STATE
+  ComponentName getDiffPropsImplementationTarget() const override;
+
   folly::dynamic getDiffProps(const Props* prevProps) const override;
   #endif
 };
@@ -993,6 +1149,8 @@ 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

@@ -1,6 +1,6 @@
 {
   "name": "@react-native/codegen",
-  "version": "0.80.0-main",
+  "version": "0.81.0-main",
   "description": "Code generation tools for React Native",
   "license": "MIT",
   "repository": {
@@ -30,7 +30,7 @@
   ],
   "dependencies": {
     "glob": "^7.1.1",
-    "hermes-parser": "0.29.0",
+    "hermes-parser": "0.29.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.29.1",
     "micromatch": "^4.0.4",
     "prettier": "2.8.8",
     "rimraf": "^3.0.2"

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

@@ -245,6 +245,7 @@ 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

@@ -85,6 +85,7 @@ function generatePropsDiffString(
         case 'StringTypeAnnotation':
         case 'Int32TypeAnnotation':
         case 'BooleanTypeAnnotation':
+        case 'MixedTypeAnnotation':
           return `
   if (${prop.name} != oldProps->${prop.name}) {
     result["${prop.name}"] = ${prop.name};
@@ -94,6 +95,14 @@ function generatePropsDiffString(
           return `
   if ((${prop.name} != oldProps->${prop.name}) && !(std::isnan(${prop.name}) && std::isnan(oldProps->${prop.name}))) {
     result["${prop.name}"] = ${prop.name};
+  }`;
+        case 'ArrayTypeAnnotation':
+        case 'ObjectTypeAnnotation':
+        case 'StringEnumTypeAnnotation':
+        case 'Int32EnumTypeAnnotation':
+          return `
+  if (${prop.name} != oldProps->${prop.name}) {
+    result["${prop.name}"] = toDynamic(${prop.name});
   }`;
         case 'ReservedPropTypeAnnotation':
           switch (typeAnnotation.name) {
@@ -103,38 +112,23 @@ function generatePropsDiffString(
     result["${prop.name}"] = *${prop.name};
   }`;
             case 'ImageSourcePrimitive':
+            case 'PointPrimitive':
+            case 'EdgeInsetsPrimitive':
+            case 'DimensionPrimitive':
               return `
   if (${prop.name} != oldProps->${prop.name}) {
-    result["${prop.name}"] = ${prop.name}.toDynamic();
+    result["${prop.name}"] = toDynamic(${prop.name});
   }`;
             case 'ImageRequestPrimitive':
               // Shouldn't be used in props
               throw new Error(
                 'ImageRequestPrimitive should not be used in Props',
               );
-            case 'PointPrimitive':
-              return `
-  if (${prop.name} != oldProps->${prop.name}) {
-    folly::dynamic pointResult = folly::dynamic::object();
-    pointResult["x"] = ${prop.name}.x;
-    pointResult["y"] = ${prop.name}.y;
-    result["${prop.name}"] = pointResult;
-  }`;
-            case 'EdgeInsetsPrimitive':
-            case 'DimensionPrimitive':
-              // TODO: Implement diffProps for complex types
-              return '';
             default:
               (typeAnnotation.name: empty);
               throw new Error('Received unknown ReservedPropTypeAnnotation');
           }
-        case 'ArrayTypeAnnotation':
-        case 'ObjectTypeAnnotation':
-        case 'StringEnumTypeAnnotation':
-        case 'Int32EnumTypeAnnotation':
-        case 'MixedTypeAnnotation':
         default:
-          // TODO: Implement diffProps for complex types
           return '';
       }
     })
@@ -142,6 +136,10 @@ 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,6 +85,8 @@ class ${className} final${extendClasses} {
   ${props}
 
   #ifdef RN_SERIALIZABLE_STATE
+  ComponentName getDiffPropsImplementationTarget() const override;
+
   folly::dynamic getDiffProps(const Props* prevProps) const override;
   #endif
 };
@@ -115,6 +117,12 @@ 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 = ({
@@ -122,11 +130,13 @@ const IntEnumTemplate = ({
   values,
   fromCases,
   toCases,
+  toDynamicCases,
 }: {
   enumName: string,
   values: string,
   fromCases: string,
   toCases: string,
+  toDynamicCases: string,
 }) =>
   `
 enum class ${enumName} { ${values} };
@@ -144,19 +154,39 @@ 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) {
@@ -168,6 +198,12 @@ 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 = ({
@@ -401,6 +437,16 @@ 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(', ');
@@ -410,6 +456,7 @@ function generateIntEnum(
       values: valueVariables,
       fromCases,
       toCases,
+      toDynamicCases,
     });
   }
 
@@ -701,12 +748,30 @@ 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/GenerateTests.js

@@ -81,8 +81,8 @@ TEST(${componentName}_${testName}, etc) {
 function getTestCasesForProp(
   propName: string,
   typeAnnotation: PropTypeAnnotation,
-) {
-  const cases = [];
+): Array<TestCase> {
+  const cases: Array<TestCase> = [];
   if (typeAnnotation.type === 'StringEnumTypeAnnotation') {
     typeAnnotation.options.forEach(option =>
       cases.push({

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

@@ -40,6 +40,10 @@ 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();
@@ -51,18 +55,57 @@ 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
@@ -98,6 +141,10 @@ 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();
@@ -109,6 +156,9 @@ folly::dynamic ArrayPropsNativeComponentProps::getDiffProps(
   }
   folly::dynamic result = HostPlatformViewProps::getDiffProps(prevProps);
   
+  if (nativePrimitives != oldProps->nativePrimitives) {
+    result[\\"nativePrimitives\\"] = toDynamic(nativePrimitives);
+  }
   return result;
 }
 #endif
@@ -144,6 +194,10 @@ 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();
@@ -193,6 +247,10 @@ 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();
@@ -242,6 +300,10 @@ 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();
@@ -288,6 +350,10 @@ 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();
@@ -338,6 +404,10 @@ 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();
@@ -349,6 +419,9 @@ folly::dynamic DimensionPropNativeComponentProps::getDiffProps(
   }
   folly::dynamic result = HostPlatformViewProps::getDiffProps(prevProps);
   
+  if (marginBack != oldProps->marginBack) {
+    result[\\"marginBack\\"] = toDynamic(marginBack);
+  }
   return result;
 }
 #endif
@@ -389,6 +462,10 @@ 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();
@@ -458,6 +535,10 @@ 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();
@@ -507,6 +588,10 @@ 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();
@@ -556,6 +641,10 @@ 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();
@@ -602,6 +691,10 @@ 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();
@@ -648,6 +741,10 @@ 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();
@@ -694,6 +791,10 @@ 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();
@@ -716,6 +817,10 @@ 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();
@@ -770,6 +875,10 @@ 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();
@@ -840,6 +949,10 @@ 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();
@@ -852,7 +965,7 @@ folly::dynamic ImagePropNativeComponentProps::getDiffProps(
   folly::dynamic result = HostPlatformViewProps::getDiffProps(prevProps);
   
   if (thumbImage != oldProps->thumbImage) {
-    result[\\"thumbImage\\"] = thumbImage.toDynamic();
+    result[\\"thumbImage\\"] = toDynamic(thumbImage);
   }
   return result;
 }
@@ -889,6 +1002,10 @@ 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();
@@ -900,6 +1017,9 @@ folly::dynamic InsetsPropNativeComponentProps::getDiffProps(
   }
   folly::dynamic result = HostPlatformViewProps::getDiffProps(prevProps);
   
+  if (contentInset != oldProps->contentInset) {
+    result[\\"contentInset\\"] = toDynamic(contentInset);
+  }
   return result;
 }
 #endif
@@ -935,6 +1055,10 @@ 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();
@@ -946,6 +1070,9 @@ folly::dynamic Int32EnumPropsNativeComponentProps::getDiffProps(
   }
   folly::dynamic result = HostPlatformViewProps::getDiffProps(prevProps);
   
+  if (maxInterval != oldProps->maxInterval) {
+    result[\\"maxInterval\\"] = toDynamic(maxInterval);
+  }
   return result;
 }
 #endif
@@ -983,6 +1110,10 @@ 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();
@@ -1040,6 +1171,10 @@ 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();
@@ -1090,6 +1225,10 @@ 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();
@@ -1101,6 +1240,9 @@ folly::dynamic MixedPropNativeComponentProps::getDiffProps(
   }
   folly::dynamic result = HostPlatformViewProps::getDiffProps(prevProps);
   
+  if (mixedProp != oldProps->mixedProp) {
+    result[\\"mixedProp\\"] = mixedProp;
+  }
   return result;
 }
 #endif
@@ -1140,6 +1282,10 @@ 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();
@@ -1152,7 +1298,7 @@ folly::dynamic ImageColorPropNativeComponentProps::getDiffProps(
   folly::dynamic result = HostPlatformViewProps::getDiffProps(prevProps);
   
   if (thumbImage != oldProps->thumbImage) {
-    result[\\"thumbImage\\"] = thumbImage.toDynamic();
+    result[\\"thumbImage\\"] = toDynamic(thumbImage);
   }
     
   if (color != oldProps->color) {
@@ -1164,10 +1310,7 @@ folly::dynamic ImageColorPropNativeComponentProps::getDiffProps(
   }
     
   if (point != oldProps->point) {
-    folly::dynamic pointResult = folly::dynamic::object();
-    pointResult[\\"x\\"] = point.x;
-    pointResult[\\"y\\"] = point.y;
-    result[\\"point\\"] = pointResult;
+    result[\\"point\\"] = toDynamic(point);
   }
   return result;
 }
@@ -1204,6 +1347,10 @@ 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();
@@ -1251,6 +1398,10 @@ 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();
@@ -1262,6 +1413,9 @@ folly::dynamic ObjectPropsProps::getDiffProps(
   }
   folly::dynamic result = HostPlatformViewProps::getDiffProps(prevProps);
   
+  if (objectProp != oldProps->objectProp) {
+    result[\\"objectProp\\"] = toDynamic(objectProp);
+  }
   return result;
 }
 #endif
@@ -1297,6 +1451,10 @@ 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();
@@ -1309,10 +1467,7 @@ folly::dynamic PointPropNativeComponentProps::getDiffProps(
   folly::dynamic result = HostPlatformViewProps::getDiffProps(prevProps);
   
   if (startPoint != oldProps->startPoint) {
-    folly::dynamic pointResult = folly::dynamic::object();
-    pointResult[\\"x\\"] = startPoint.x;
-    pointResult[\\"y\\"] = startPoint.y;
-    result[\\"startPoint\\"] = pointResult;
+    result[\\"startPoint\\"] = toDynamic(startPoint);
   }
   return result;
 }
@@ -1349,6 +1504,10 @@ 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();
@@ -1360,6 +1519,9 @@ folly::dynamic StringEnumPropsNativeComponentProps::getDiffProps(
   }
   folly::dynamic result = HostPlatformViewProps::getDiffProps(prevProps);
   
+  if (alignment != oldProps->alignment) {
+    result[\\"alignment\\"] = toDynamic(alignment);
+  }
   return result;
 }
 #endif
@@ -1396,6 +1558,10 @@ 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();
@@ -1449,6 +1615,10 @@ 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();
@@ -1474,6 +1644,10 @@ 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();
@@ -1523,6 +1697,10 @@ 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();
@@ -1548,6 +1726,10 @@ 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,6 +16,7 @@ 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>
@@ -86,6 +87,16 @@ 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) {
@@ -101,6 +112,12 @@ 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) {
@@ -113,6 +130,16 @@ 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) {
@@ -128,6 +155,12 @@ 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) {
@@ -140,6 +173,16 @@ 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) {
@@ -155,6 +198,12 @@ 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) {
@@ -167,6 +216,16 @@ 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) {
@@ -182,6 +241,12 @@ 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) {
@@ -217,6 +282,8 @@ 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
 };
@@ -254,6 +321,18 @@ 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) {
@@ -277,6 +356,12 @@ 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) {
@@ -296,6 +381,8 @@ 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
 };
@@ -333,6 +420,8 @@ 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
 };
@@ -371,6 +460,8 @@ class ColorPropNativeComponentProps final : public ViewProps {
   SharedColor tintColor{};
 
   #ifdef RN_SERIALIZABLE_STATE
+  ComponentName getDiffPropsImplementationTarget() const override;
+
   folly::dynamic getDiffProps(const Props* prevProps) const override;
   #endif
 };
@@ -408,6 +499,8 @@ class CommandNativeComponentProps final : public ViewProps {
   
 
   #ifdef RN_SERIALIZABLE_STATE
+  ComponentName getDiffPropsImplementationTarget() const override;
+
   folly::dynamic getDiffProps(const Props* prevProps) const override;
   #endif
 };
@@ -445,6 +538,8 @@ 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
 };
@@ -469,6 +564,7 @@ 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 {
@@ -483,6 +579,8 @@ class DimensionPropNativeComponentProps final : public ViewProps {
   YGValue marginBack{};
 
   #ifdef RN_SERIALIZABLE_STATE
+  ComponentName getDiffPropsImplementationTarget() const override;
+
   folly::dynamic getDiffProps(const Props* prevProps) const override;
   #endif
 };
@@ -525,6 +623,8 @@ 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
 };
@@ -562,6 +662,8 @@ 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
 };
@@ -599,6 +701,8 @@ 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
 };
@@ -636,6 +740,8 @@ class InterfaceOnlyComponentProps final : public ViewProps {
   
 
   #ifdef RN_SERIALIZABLE_STATE
+  ComponentName getDiffPropsImplementationTarget() const override;
+
   folly::dynamic getDiffProps(const Props* prevProps) const override;
   #endif
 };
@@ -673,6 +779,8 @@ class ExcludedAndroidComponentProps final : public ViewProps {
   
 
   #ifdef RN_SERIALIZABLE_STATE
+  ComponentName getDiffPropsImplementationTarget() const override;
+
   folly::dynamic getDiffProps(const Props* prevProps) const override;
   #endif
 };
@@ -710,6 +818,8 @@ class ExcludedAndroidIosComponentProps final : public ViewProps {
   
 
   #ifdef RN_SERIALIZABLE_STATE
+  ComponentName getDiffPropsImplementationTarget() const override;
+
   folly::dynamic getDiffProps(const Props* prevProps) const override;
   #endif
 };
@@ -747,6 +857,8 @@ class ExcludedIosComponentProps final : public ViewProps {
   
 
   #ifdef RN_SERIALIZABLE_STATE
+  ComponentName getDiffPropsImplementationTarget() const override;
+
   folly::dynamic getDiffProps(const Props* prevProps) const override;
   #endif
 };
@@ -761,6 +873,8 @@ 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
 };
@@ -803,6 +917,8 @@ 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
 };
@@ -841,6 +957,8 @@ class ImagePropNativeComponentProps final : public ViewProps {
   ImageSource thumbImage{};
 
   #ifdef RN_SERIALIZABLE_STATE
+  ComponentName getDiffPropsImplementationTarget() const override;
+
   folly::dynamic getDiffProps(const Props* prevProps) const override;
   #endif
 };
@@ -879,6 +997,8 @@ class InsetsPropNativeComponentProps final : public ViewProps {
   EdgeInsets contentInset{};
 
   #ifdef RN_SERIALIZABLE_STATE
+  ComponentName getDiffPropsImplementationTarget() const override;
+
   folly::dynamic getDiffProps(const Props* prevProps) const override;
   #endif
 };
@@ -933,6 +1053,16 @@ 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;
@@ -943,6 +1073,8 @@ 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
 };
@@ -982,6 +1114,8 @@ 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
 };
@@ -1019,6 +1153,8 @@ 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
 };
@@ -1056,6 +1192,8 @@ 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
 };
@@ -1099,6 +1237,8 @@ class ImageColorPropNativeComponentProps final : public ViewProps {
   Point point{};
 
   #ifdef RN_SERIALIZABLE_STATE
+  ComponentName getDiffPropsImplementationTarget() const override;
+
   folly::dynamic getDiffProps(const Props* prevProps) const override;
   #endif
 };
@@ -1136,6 +1276,8 @@ class NoPropsNoEventsComponentProps final : public ViewProps {
   
 
   #ifdef RN_SERIALIZABLE_STATE
+  ComponentName getDiffPropsImplementationTarget() const override;
+
   folly::dynamic getDiffProps(const Props* prevProps) const override;
   #endif
 };
@@ -1182,6 +1324,12 @@ 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) {
@@ -1200,8 +1348,26 @@ 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) {
@@ -1217,10 +1383,28 @@ 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) {
@@ -1244,8 +1428,24 @@ 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) {
@@ -1261,8 +1461,24 @@ 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) {
@@ -1278,8 +1494,24 @@ 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) {
@@ -1295,6 +1527,12 @@ 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) {
@@ -1307,6 +1545,16 @@ 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) {
@@ -1322,6 +1570,12 @@ 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};
@@ -1337,6 +1591,29 @@ 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) {
@@ -1403,6 +1680,12 @@ 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;
@@ -1413,6 +1696,8 @@ class ObjectPropsProps final : public ViewProps {
   ObjectPropsObjectPropStruct objectProp{};
 
   #ifdef RN_SERIALIZABLE_STATE
+  ComponentName getDiffPropsImplementationTarget() const override;
+
   folly::dynamic getDiffProps(const Props* prevProps) const override;
   #endif
 };
@@ -1451,6 +1736,8 @@ class PointPropNativeComponentProps final : public ViewProps {
   Point startPoint{};
 
   #ifdef RN_SERIALIZABLE_STATE
+  ComponentName getDiffPropsImplementationTarget() const override;
+
   folly::dynamic getDiffProps(const Props* prevProps) const override;
   #endif
 };
@@ -1496,6 +1783,12 @@ 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;
@@ -1506,6 +1799,8 @@ 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
 };
@@ -1544,6 +1839,8 @@ 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
 };
@@ -1581,6 +1878,8 @@ 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
 };
@@ -1595,6 +1894,8 @@ 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
 };
@@ -1632,6 +1933,8 @@ 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
 };
@@ -1646,6 +1949,8 @@ 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-compatibility-check/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@react-native/compatibility-check",
-  "version": "0.80.0-main",
+  "version": "0.81.0-main",
   "description": "Check a React Native app's boundary between JS and Native for incompatibilities",
   "license": "MIT",
   "repository": {
@@ -29,7 +29,7 @@
     "dist"
   ],
   "dependencies": {
-    "@react-native/codegen": "0.80.0-main"
+    "@react-native/codegen": "0.81.0-main"
   },
   "devDependencies": {
     "flow-remove-types": "^2.237.2",

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

@@ -1,6 +1,6 @@
 {
   "name": "@react-native/popup-menu-android",
-  "version": "0.80.0-main",
+  "version": "0.81.0-main",
   "description": "PopupMenu for the Android platform",
   "main": "index.js",
   "files": [
@@ -21,7 +21,7 @@
   },
   "license": "MIT",
   "devDependencies": {
-    "@react-native/codegen": "0.80.0-main"
+    "@react-native/codegen": "0.81.0-main"
   },
   "peerDependencies": {
     "@types/react": "^19.1.0",

packages/react-native-test-library/android/src/main/java/com/facebook/react/osslibraryexample/OSSLibraryExamplePackage.kt

@@ -12,7 +12,9 @@ import com.facebook.react.bridge.NativeModule
 import com.facebook.react.bridge.ReactApplicationContext
 import com.facebook.react.uimanager.ViewManager
 
+@Suppress("DEPRECATION")
 public class OSSLibraryExamplePackage : ReactPackage {
+  @Deprecated("Migrate to [BaseReactPackage] and implement [getModule] instead.")
   override fun createNativeModules(reactContext: ReactApplicationContext): List<NativeModule> =
       listOf(NativeSampleModule(reactContext))
 

packages/react-native-test-library/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@react-native/oss-library-example",
-  "version": "0.80.0-main",
+  "version": "0.81.0-main",
   "private": true,
   "description": "Package that includes native module exapmle, native component example, targets both the old and the new architecture. It should serve as an example of a real-world OSS library.",
   "license": "MIT",
@@ -26,7 +26,7 @@
   ],
   "devDependencies": {
     "@babel/core": "^7.25.2",
-    "@react-native/babel-preset": "0.80.0-main",
+    "@react-native/babel-preset": "0.81.0-main",
     "react-native": "1000.0.0"
   },
   "peerDependencies": {

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

@@ -12,6 +12,7 @@
 
 import type {NativeSyntheticEvent} from '../Types/CoreEventTypes';
 import type {PlatformConfig} from './AnimatedPlatformConfig';
+import type {EventMapping} from './NativeAnimatedModule';
 
 import NativeAnimatedHelper from '../../src/private/animated/NativeAnimatedHelper';
 import {findNodeHandle} from '../ReactNative/RendererProxy';
@@ -37,7 +38,7 @@ export function attachNativeEventImpl(
 ): {detach: () => void} {
   // Find animated values in `argMapping` and create an array representing their
   // key path inside the `nativeEvent` object. Ex.: ['contentOffset', 'x'].
-  const eventMappings = [];
+  const eventMappings: Array<EventMapping> = [];
 
   const traverse = (value: mixed, path: Array<string>) => {
     if (value instanceof AnimatedValue) {

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

@@ -247,10 +247,6 @@ describe('Animated', () => {
     });
 
     it('renders animated and primitive style correctly', () => {
-      ReactNativeFeatureFlags.override({
-        alwaysFlattenAnimatedStyles: () => true,
-      });
-
       const anim = new Animated.Value(0);
       const staticProps = {
         style: [
@@ -376,8 +372,7 @@ describe('Animated', () => {
       const anim2 = {start: jest.fn()};
       const cb = jest.fn();
 
-      // $FlowFixMe[prop-missing]
-      const seq = Animated.sequence([anim1, anim2]);
+      const seq = Animated.sequence([anim1 as $FlowFixMe, anim2 as $FlowFixMe]);
 
       expect(anim1.start).not.toBeCalled();
       expect(anim2.start).not.toBeCalled();
@@ -402,8 +397,7 @@ describe('Animated', () => {
       const anim2 = {start: jest.fn()};
       const cb = jest.fn();
 
-      // $FlowFixMe[prop-missing]
-      Animated.sequence([anim1, anim2]).start(cb);
+      Animated.sequence([anim1 as $FlowFixMe, anim2 as $FlowFixMe]).start(cb);
 
       anim1.start.mock.calls[0][0]({finished: false});
 
@@ -417,8 +411,7 @@ describe('Animated', () => {
       const anim2 = {start: jest.fn(), stop: jest.fn()};
       const cb = jest.fn();
 
-      // $FlowFixMe[prop-missing]
-      const seq = Animated.sequence([anim1, anim2]);
+      const seq = Animated.sequence([anim1 as $FlowFixMe, anim2 as $FlowFixMe]);
       seq.start(cb);
       seq.stop();
 
@@ -436,8 +429,7 @@ describe('Animated', () => {
       const anim2 = {start: jest.fn(), stop: jest.fn()};
       const cb = jest.fn();
 
-      // $FlowFixMe[prop-missing]
-      const seq = Animated.sequence([anim1, anim2]);
+      const seq = Animated.sequence([anim1 as $FlowFixMe, anim2 as $FlowFixMe]);
 
       seq.start(cb);
 
@@ -460,8 +452,7 @@ describe('Animated', () => {
       const anim2 = {start: jest.fn(), stop: jest.fn()};
       const cb = jest.fn();
 
-      // $FlowFixMe[prop-missing]
-      const seq = Animated.sequence([anim1, anim2]);
+      const seq = Animated.sequence([anim1 as $FlowFixMe, anim2 as $FlowFixMe]);
 
       seq.start(cb);
       anim1.start.mock.calls[0][0]({finished: true});
@@ -487,8 +478,7 @@ describe('Animated', () => {
       };
       const cb = jest.fn();
 
-      // $FlowFixMe[prop-missing]
-      const loop = Animated.loop(animation);
+      const loop = Animated.loop(animation as $FlowFixMe);
 
       expect(animation.start).not.toBeCalled();
 
@@ -519,8 +509,7 @@ describe('Animated', () => {
       };
       const cb = jest.fn();
 
-      // $FlowFixMe[prop-missing]
-      const loop = Animated.loop(animation, {iterations: -1});
+      const loop = Animated.loop(animation as $FlowFixMe, {iterations: -1});
 
       expect(animation.start).not.toBeCalled();
 
@@ -551,8 +540,10 @@ describe('Animated', () => {
       };
       const cb = jest.fn();
 
-      // $FlowFixMe[prop-missing]
-      const loop = Animated.loop(animation, {anotherKey: 'value'});
+      const loop = Animated.loop(
+        animation as $FlowFixMe,
+        {anotherKey: 'value'} as $FlowFixMe,
+      );
 
       expect(animation.start).not.toBeCalled();
 
@@ -583,8 +574,7 @@ describe('Animated', () => {
       };
       const cb = jest.fn();
 
-      // $FlowFixMe[prop-missing]
-      const loop = Animated.loop(animation, {iterations: 3});
+      const loop = Animated.loop(animation as $FlowFixMe, {iterations: 3});
 
       expect(animation.start).not.toBeCalled();
 
@@ -615,8 +605,7 @@ describe('Animated', () => {
       };
       const cb = jest.fn();
 
-      // $FlowFixMe[prop-missing]
-      const loop = Animated.loop(animation, {iterations: 1});
+      const loop = Animated.loop(animation as $FlowFixMe, {iterations: 1});
 
       expect(animation.start).not.toBeCalled();
 
@@ -637,8 +626,7 @@ describe('Animated', () => {
       };
       const cb = jest.fn();
 
-      // $FlowFixMe[prop-missing]
-      const loop = Animated.loop(animation, {iterations: 0});
+      const loop = Animated.loop(animation as $FlowFixMe, {iterations: 0});
 
       expect(animation.start).not.toBeCalled();
 
@@ -656,8 +644,7 @@ describe('Animated', () => {
       };
       const cb = jest.fn();
 
-      // $FlowFixMe[prop-missing]
-      Animated.loop(animation).start(cb);
+      Animated.loop(animation as $FlowFixMe).start(cb);
       expect(animation.start).toBeCalled();
       expect(animation.reset).toHaveBeenCalledTimes(1);
       expect(cb).not.toBeCalled();
@@ -680,8 +667,7 @@ describe('Animated', () => {
       };
       const cb = jest.fn();
 
-      // $FlowFixMe[prop-missing]
-      const loop = Animated.loop(animation);
+      const loop = Animated.loop(animation as $FlowFixMe);
       loop.start(cb);
       loop.stop();
 
@@ -703,8 +689,10 @@ describe('Animated', () => {
     };
     const cb = jest.fn();
 
-    // $FlowFixMe[prop-missing]
-    const loop = Animated.loop(animation, {resetBeforeIteration: false});
+    const loop = Animated.loop(
+      animation as $FlowFixMe,
+      {resetBeforeIteration: false} as $FlowFixMe,
+    );
 
     expect(animation.start).not.toBeCalled();
 
@@ -730,8 +718,7 @@ describe('Animated', () => {
   it('restarts sequence normally in a loop if resetBeforeIteration is false', () => {
     const anim1 = {start: jest.fn(), stop: jest.fn()};
     const anim2 = {start: jest.fn(), stop: jest.fn()};
-    // $FlowFixMe[prop-missing]
-    const seq = Animated.sequence([anim1, anim2]);
+    const seq = Animated.sequence([anim1 as $FlowFixMe, anim2 as $FlowFixMe]);
 
     // $FlowFixMe[prop-missing]
     const loop = Animated.loop(seq, {resetBeforeIteration: false});
@@ -761,9 +748,7 @@ describe('Animated', () => {
     it('works with an empty element in array', () => {
       const anim1 = {start: jest.fn()};
       const cb = jest.fn();
-      // $FlowFixMe[incompatible-call]
-      // $FlowFixMe[prop-missing]
-      Animated.parallel([null, anim1]).start(cb);
+      Animated.parallel([null as $FlowFixMe, anim1 as $FlowFixMe]).start(cb);
 
       expect(anim1.start).toBeCalled();
       anim1.start.mock.calls[0][0]({finished: true});
@@ -776,9 +761,7 @@ describe('Animated', () => {
       const anim2 = {start: jest.fn()};
       const cb = jest.fn();
 
-      // $FlowFixMe[prop-missing]
-      // $FlowFixMe[prop-missing]
-      const par = Animated.parallel([anim1, anim2]);
+      const par = Animated.parallel([anim1 as $FlowFixMe, anim2 as $FlowFixMe]);
 
       expect(anim1.start).not.toBeCalled();
       expect(anim2.start).not.toBeCalled();
@@ -801,8 +784,7 @@ describe('Animated', () => {
       const anim2 = {start: jest.fn(), stop: jest.fn()};
       const cb = jest.fn();
 
-      // $FlowFixMe[prop-missing]
-      const seq = Animated.parallel([anim1, anim2]);
+      const seq = Animated.parallel([anim1 as $FlowFixMe, anim2 as $FlowFixMe]);
       seq.start(cb);
       seq.stop();
 
@@ -823,8 +805,11 @@ describe('Animated', () => {
       const anim3 = {start: jest.fn(), stop: jest.fn()};
       const cb = jest.fn();
 
-      // $FlowFixMe[prop-missing]
-      const seq = Animated.parallel([anim1, anim2, anim3]);
+      const seq = Animated.parallel([
+        anim1 as $FlowFixMe,
+        anim2 as $FlowFixMe,
+        anim3 as $FlowFixMe,
+      ]);
       seq.start(cb);
 
       anim1.start.mock.calls[0][0]({finished: false});
@@ -851,8 +836,7 @@ describe('Animated', () => {
     it('should call anim after delay in sequence', () => {
       const anim = {start: jest.fn(), stop: jest.fn()};
       const cb = jest.fn();
-      // $FlowFixMe[prop-missing]
-      Animated.sequence([Animated.delay(1000), anim]).start(cb);
+      Animated.sequence([Animated.delay(1000), anim as $FlowFixMe]).start(cb);
       jest.runAllTimers();
       expect(anim.start.mock.calls.length).toBe(1);
       expect(cb).not.toBeCalled();

packages/react-native/Libraries/Animated/nodes/AnimatedProps.js

@@ -13,7 +13,6 @@ import type {AnimatedNodeConfig} from './AnimatedNode';
 import type {AnimatedStyleAllowlist} from './AnimatedStyle';
 
 import NativeAnimatedHelper from '../../../src/private/animated/NativeAnimatedHelper';
-import * as ReactNativeFeatureFlags from '../../../src/private/featureflags/ReactNativeFeatureFlags';
 import {findNodeHandle} from '../../ReactNative/RendererProxy';
 import flattenStyle from '../../StyleSheet/flattenStyle';
 import {AnimatedEvent} from '../AnimatedEvent';
@@ -58,9 +57,7 @@ function createAnimatedProps(
           // we propagate the flattened `style` object to the `props` object.
           const flatStyle = flattenStyle(value as $FlowFixMe);
           node = AnimatedStyle.from(flatStyle, allowlist?.style, value);
-          if (ReactNativeFeatureFlags.alwaysFlattenAnimatedStyles()) {
-            staticValue = flatStyle;
-          }
+          staticValue = flatStyle;
         }
       } else if (value instanceof AnimatedNode) {
         node = value;
@@ -164,9 +161,7 @@ export default class AnimatedProps extends AnimatedNode {
           maybeNode.__replaceAnimatedNodeWithValues(mutableStyle);
           props[key] = maybeNode.__getValueForStyle(mutableStyle);
         } else {
-          if (ReactNativeFeatureFlags.alwaysFlattenAnimatedStyles()) {
-            props[key] = flatStaticStyle;
-          }
+          props[key] = flatStaticStyle;
         }
       } else if (maybeNode instanceof AnimatedNode) {
         props[key] = maybeNode.__getValue();

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

@@ -84,4 +84,5 @@ Pod::Spec.new do |s|
 
   depend_on_js_engine(s)
   add_rn_third_party_dependencies(s)
+  add_rncore_dependency(s)
 end

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

@@ -55,4 +55,5 @@ Pod::Spec.new do |s|
   end
 
   add_rn_third_party_dependencies(s)
+  add_rncore_dependency(s)
 end