react-native-tvos 0.85.0-0rc5 → 0.85.2-0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-tvos",
-  "version": "0.85.0-0rc5",
+  "version": "0.85.2-0",
   "description": "A framework for building native apps using React",
   "license": "MIT",
   "repository": {
@@ -154,7 +154,7 @@
     "featureflags-check": "node ./scripts/featureflags/index.js --verify-unchanged"
   },
   "peerDependencies": {
-    "@react-native/jest-preset": "0.85.0-rc.5",
+    "@react-native/jest-preset": "0.85.2",
     "@types/react": "^19.1.1",
     "react": "^19.2.3"
   },
@@ -167,12 +167,12 @@
     }
   },
   "dependencies": {
-    "@react-native/assets-registry": "0.85.0-rc.5",
-    "@react-native/codegen": "0.85.0-rc.5",
-    "@react-native/community-cli-plugin": "0.85.0-rc.5",
-    "@react-native/gradle-plugin": "0.85.0-rc.5",
-    "@react-native/js-polyfills": "0.85.0-rc.5",
-    "@react-native/normalize-colors": "0.85.0-rc.5",
+    "@react-native/assets-registry": "0.85.2",
+    "@react-native/codegen": "0.85.2",
+    "@react-native/community-cli-plugin": "0.85.2",
+    "@react-native/gradle-plugin": "0.85.2",
+    "@react-native/js-polyfills": "0.85.2",
+    "@react-native/normalize-colors": "0.85.2",
     "abort-controller": "^3.0.0",
     "anser": "^1.4.9",
     "ansi-regex": "^5.0.0",
@@ -198,7 +198,7 @@
     "whatwg-fetch": "^3.0.0",
     "ws": "^7.5.10",
     "yargs": "^17.6.2",
-    "@react-native-tvos/virtualized-lists": "0.85.0-0rc5"
+    "@react-native-tvos/virtualized-lists": "0.85.2-0"
   },
   "codegenConfig": {
     "libraries": [

package/scripts/codegen/generate-artifacts-executor/generateAppDependencyProvider.js

@@ -10,7 +10,7 @@
 
 'use strict';
 const {TEMPLATES_FOLDER_PATH, packageJson} = require('./constants');
-const {codegenLog} = require('./utils');
+const {codegenLog, writeFileSyncIfChanged} = require('./utils');
 const fs = require('fs');
 const path = require('path');
 
@@ -38,7 +38,7 @@ function generateAppDependencyProvider(outputDir /*: string */) {
     'utf8',
   );
   const finalPathH = path.join(outputDir, 'RCTAppDependencyProvider.h');
-  fs.writeFileSync(finalPathH, templateH);
+  writeFileSyncIfChanged(finalPathH, templateH);
   codegenLog(`Generated artifact: ${finalPathH}`);
 
   const templateMM = fs.readFileSync(
@@ -46,7 +46,7 @@ function generateAppDependencyProvider(outputDir /*: string */) {
     'utf8',
   );
   const finalPathMM = path.join(outputDir, 'RCTAppDependencyProvider.mm');
-  fs.writeFileSync(finalPathMM, templateMM);
+  writeFileSyncIfChanged(finalPathMM, templateMM);
   codegenLog(`Generated artifact: ${finalPathMM}`);
 
   // Generate the podspec file
@@ -58,7 +58,7 @@ function generateAppDependencyProvider(outputDir /*: string */) {
     outputDir,
     'ReactAppDependencyProvider.podspec',
   );
-  fs.writeFileSync(finalPathPodspec, templatePodspec);
+  writeFileSyncIfChanged(finalPathPodspec, templatePodspec);
   codegenLog(`Generated podspec: ${finalPathPodspec}`);
 }
 

package/scripts/codegen/generate-artifacts-executor/generateCustomURLHandlers.js

@@ -11,7 +11,7 @@
 'use strict';
 
 const {TEMPLATES_FOLDER_PATH} = require('./constants');
-const {parseiOSAnnotations} = require('./utils');
+const {parseiOSAnnotations, writeFileSyncIfChanged} = require('./utils');
 const fs = require('fs');
 const path = require('path');
 
@@ -105,13 +105,13 @@ function generateCustomURLHandlers(
 
   fs.mkdirSync(outputDir, {recursive: true});
 
-  fs.writeFileSync(
+  writeFileSyncIfChanged(
     path.join(outputDir, 'RCTModulesConformingToProtocolsProvider.mm'),
     finalMMFile,
   );
 
   const templateH = fs.readFileSync(MODULES_PROTOCOLS_H_TEMPLATE_PATH, 'utf8');
-  fs.writeFileSync(
+  writeFileSyncIfChanged(
     path.join(outputDir, 'RCTModulesConformingToProtocolsProvider.h'),
     templateH,
   );

package/scripts/codegen/generate-artifacts-executor/generateNativeCode.js

@@ -12,7 +12,7 @@
 
 const generateSpecsCLIExecutor = require('../generate-specs-cli-executor');
 const {CORE_LIBRARIES_WITH_OUTPUT_FOLDER} = require('./constants');
-const {codegenLog} = require('./utils');
+const {codegenLog, cpSyncRecursiveIfChanged} = require('./utils');
 const fs = require('fs');
 const os = require('os');
 const path = require('path');
@@ -63,8 +63,7 @@ function generateCode(
   const outputDir =
     reactNativeCoreLibraryOutputPath(libraryName, platform) ?? outputPath;
   fs.mkdirSync(outputDir, {recursive: true});
-  // $FlowFixMe[prop-missing] - `fs.cpSync` is missing in Flow libdefs.
-  fs.cpSync(tmpOutputDir, outputDir, {recursive: true});
+  cpSyncRecursiveIfChanged(tmpOutputDir, outputDir);
   codegenLog(`Generated artifacts: ${outputDir}`);
 }
 

package/scripts/codegen/generate-artifacts-executor/generatePackageSwift.js

@@ -10,7 +10,7 @@
 
 'use strict';
 const {TEMPLATES_FOLDER_PATH} = require('./constants');
-const {codegenLog} = require('./utils');
+const {codegenLog, writeFileSyncIfChanged} = require('./utils');
 const fs = require('fs');
 const path = require('path');
 
@@ -35,7 +35,7 @@ function generatePackageSwift(
       path.relative(fullOutputPath, reactNativePath),
     );
   const finalPathH = path.join(outputDir, 'Package.swift');
-  fs.writeFileSync(finalPathH, templateH);
+  writeFileSyncIfChanged(finalPathH, templateH);
   codegenLog(`Generated artifact: ${finalPathH}`);
 }
 

package/scripts/codegen/generate-artifacts-executor/generateRCTModuleProviders.js

@@ -14,6 +14,7 @@ const {
   codegenLog,
   isReactNativeCoreLibrary,
   parseiOSAnnotations,
+  writeFileSyncIfChanged,
 } = require('./utils');
 const fs = require('fs');
 const path = require('path');
@@ -39,7 +40,7 @@ function generateRCTModuleProviders(
   codegenLog('Generating RCTModulesProvider.h');
   const templateH = fs.readFileSync(MODULE_PROVIDERS_H_TEMPLATE_PATH, 'utf8');
   const finalPathH = path.join(outputDir, 'RCTModuleProviders.h');
-  fs.writeFileSync(finalPathH, templateH);
+  writeFileSyncIfChanged(finalPathH, templateH);
   codegenLog(`Generated artifact: ${finalPathH}`);
 
   codegenLog('Generating RCTModuleProviders.mm');
@@ -112,7 +113,7 @@ function generateRCTModuleProviders(
     .readFileSync(MODULE_PROVIDERS_MM_TEMPLATE_PATH, 'utf8')
     .replace(/{moduleMapping}/, modulesMapping);
   const finalPathMM = path.join(outputDir, 'RCTModuleProviders.mm');
-  fs.writeFileSync(finalPathMM, templateMM);
+  writeFileSyncIfChanged(finalPathMM, templateMM);
   codegenLog(`Generated artifact: ${finalPathMM}`);
 }
 

package/scripts/codegen/generate-artifacts-executor/generateRCTThirdPartyComponents.js

@@ -15,6 +15,7 @@ const {
   codegenLog,
   isReactNativeCoreLibrary,
   parseiOSAnnotations,
+  writeFileSyncIfChanged,
 } = require('./utils');
 const fs = require('fs');
 const path = require('path');
@@ -41,7 +42,7 @@ function generateRCTThirdPartyComponents(
     'utf8',
   );
   const finalPathH = path.join(outputDir, 'RCTThirdPartyComponentsProvider.h');
-  fs.writeFileSync(finalPathH, templateH);
+  writeFileSyncIfChanged(finalPathH, templateH);
   codegenLog(`Generated artifact: ${finalPathH}`);
 
   codegenLog('Generating RCTThirdPartyComponentsProvider.mm');
@@ -150,7 +151,7 @@ function generateRCTThirdPartyComponents(
     outputDir,
     'RCTThirdPartyComponentsProvider.mm',
   );
-  fs.writeFileSync(finalPathMM, templateMM);
+  writeFileSyncIfChanged(finalPathMM, templateMM);
   codegenLog(`Generated artifact: ${finalPathMM}`);
 }
 

package/scripts/codegen/generate-artifacts-executor/generateReactCodegenPodspec.js

@@ -15,7 +15,7 @@ const {
   TEMPLATES_FOLDER_PATH,
   packageJson,
 } = require('./constants');
-const {codegenLog} = require('./utils');
+const {codegenLog, writeFileSyncIfChanged} = require('./utils');
 const {execSync} = require('child_process');
 const fs = require('fs');
 const path = require('path');
@@ -39,7 +39,7 @@ function generateReactCodegenPodspec(
     .replace(/{input-files}/, inputFiles)
     .replace(/{codegen-script}/, codegenScript);
   const finalPathPodspec = path.join(outputPath, 'ReactCodegen.podspec');
-  fs.writeFileSync(finalPathPodspec, finalPodspec);
+  writeFileSyncIfChanged(finalPathPodspec, finalPodspec);
   codegenLog(`Generated podspec: ${finalPathPodspec}`);
 }
 

package/scripts/codegen/generate-artifacts-executor/generateUnstableModulesRequiringMainQueueSetupProvider.js

@@ -11,7 +11,7 @@
 'use strict';
 
 const {TEMPLATES_FOLDER_PATH} = require('./constants');
-const {parseiOSAnnotations} = require('./utils');
+const {parseiOSAnnotations, writeFileSyncIfChanged} = require('./utils');
 const fs = require('fs');
 const path = require('path');
 
@@ -70,7 +70,7 @@ function generateUnstableModulesRequiringMainQueueSetupProvider(
 
   fs.mkdirSync(outputDir, {recursive: true});
 
-  fs.writeFileSync(
+  writeFileSyncIfChanged(
     path.join(
       outputDir,
       'RCTUnstableModulesRequiringMainQueueSetupProvider.mm',
@@ -82,7 +82,7 @@ function generateUnstableModulesRequiringMainQueueSetupProvider(
     UNSTABLE_MODULES_REQUIRING_MAIN_QUEUE_SETUP_PROVIDER_H_TEMPLATE_PATH,
     'utf8',
   );
-  fs.writeFileSync(
+  writeFileSyncIfChanged(
     path.join(outputDir, 'RCTUnstableModulesRequiringMainQueueSetupProvider.h'),
     templateH,
   );

package/scripts/codegen/generate-artifacts-executor/utils.js

@@ -499,6 +499,52 @@ function findReactNativeRootPath(projectRoot /* : string */) /* : string */ {
   }
 }
 
+function writeFileSyncIfChanged(
+  targetPath /*: string */,
+  contents /*: string */,
+) {
+  try {
+    const oldContents = fs.readFileSync(targetPath, 'utf8');
+    if (oldContents === contents) {
+      return;
+    }
+  } catch (error) {
+    if (error.code !== 'ENOENT') {
+      throw error;
+    }
+  }
+  fs.writeFileSync(targetPath, contents);
+}
+
+function cpSyncRecursiveIfChanged(
+  sourcePath /*: string */,
+  targetPath /*: string */,
+) {
+  fs.cpSync(sourcePath, targetPath, {
+    recursive: true,
+    force: true,
+    preserveTimestamps: true,
+    filter(src /*: string */, dest /*: string */) {
+      try {
+        const stat = fs.statSync(src);
+        if (!stat.isFile()) {
+          return true;
+        } else {
+          const oldContents = fs.readFileSync(dest, 'utf8');
+          const newContents = fs.readFileSync(src, 'utf8');
+          return oldContents !== newContents;
+        }
+      } catch (error) {
+        if (error.code !== 'ENOENT' && error.code !== 'EISDIR') {
+          throw error;
+        } else {
+          return true;
+        }
+      }
+    },
+  });
+}
+
 module.exports = {
   buildCodegenIfNeeded,
   pkgJsonIncludesGeneratedCode,
@@ -513,4 +559,6 @@ module.exports = {
   readReactNativeConfig,
   findDisabledLibrariesByPlatform,
   findReactNativeRootPath,
+  writeFileSyncIfChanged,
+  cpSyncRecursiveIfChanged,
 };

package/src/private/featureflags/ReactNativeFeatureFlags.js

@@ -4,7 +4,7 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @generated SignedSource<<03688450419694f6d3f4fc709df4de9a>>
+ * @generated SignedSource<<d6dc08325764e3acb135a95ae923710b>>
  * @flow strict
  * @noformat
  */
@@ -275,7 +275,7 @@ export const enableCppPropsIteratorSetter: Getter<boolean> = createNativeFlagGet
 /**
  * This enables the fabric implementation of focus search so that we can focus clipped elements
  */
-export const enableCustomFocusSearchOnClippedElementsAndroid: Getter<boolean> = createNativeFlagGetter('enableCustomFocusSearchOnClippedElementsAndroid', true);
+export const enableCustomFocusSearchOnClippedElementsAndroid: Getter<boolean> = createNativeFlagGetter('enableCustomFocusSearchOnClippedElementsAndroid', false);
 /**
  * Enables destructor calls for ShadowTreeRevision in the background to reduce UI thread work.
  */

package/types/public/ReactNativeTVTypes.d.ts

@@ -11,6 +11,14 @@ declare module 'react-native' {
      * Only used when `snapToAlignment` is set to `'item'`.
      */
     snapToItemPadding?: number | undefined;
+
+    /**
+     * When false, the scroll view will jump to the correct offset without animation
+     * when focus changes. Defaults to true.
+     *
+     * @platform tv
+     */
+    scrollAnimationEnabled?: boolean | undefined;
   }
 
   interface ViewProps {