react-native-tvos 0.83.2-0 → 0.83.4-0

package/scripts/replace-rncore-version.js

@@ -12,6 +12,8 @@
 
 const {spawnSync} = require('child_process');
 const fs = require('fs');
+const os = require('os');
+const path = require('path');
 const yargs = require('yargs');
 
 const LAST_BUILD_FILENAME = 'React-Core-prebuilt/.last_build_configuration';
@@ -62,14 +64,66 @@ function replaceRNCoreConfiguration(
   const tarballURLPath = `${podsRoot}/ReactNativeCore-artifacts/reactnative-core-${version.toLowerCase()}-${configuration.toLowerCase()}.tar.gz`;
 
   const finalLocation = 'React-Core-prebuilt';
-  console.log('Preparing the final location', finalLocation);
-  fs.rmSync(finalLocation, {force: true, recursive: true});
-  fs.mkdirSync(finalLocation, {recursive: true});
-
-  console.log('Extracting the tarball', tarballURLPath);
-  spawnSync('tar', ['-xf', tarballURLPath, '-C', finalLocation], {
-    stdio: 'inherit',
-  });
+
+  // Extract to a temporary directory on a regular filesystem first, then move
+  // into the final location. This avoids issues with partial tar extraction on
+  // certain filesystems (e.g. EdenFS) where extracting directly can silently
+  // produce incomplete results.
+  const tmpDir = fs.mkdtempSync(path.join(os.tmpdir(), 'rncore-'));
+  const tmpExtractDir = path.join(tmpDir, 'React-Core-prebuilt');
+  fs.mkdirSync(tmpExtractDir, {recursive: true});
+
+  try {
+    console.log('Extracting the tarball to temp dir', tarballURLPath);
+    const result = spawnSync(
+      'tar',
+      ['-xf', tarballURLPath, '-C', tmpExtractDir],
+      {
+        stdio: 'inherit',
+      },
+    );
+
+    if (result.status !== 0) {
+      throw new Error(`tar extraction failed with exit code ${result.status}`);
+    }
+
+    // Verify extraction produced the expected xcframework structure
+    const xcfwPath = path.join(tmpExtractDir, 'React.xcframework');
+    const modulemapPath = path.join(xcfwPath, 'Modules', 'module.modulemap');
+    if (!fs.existsSync(modulemapPath)) {
+      throw new Error(
+        `Extraction verification failed: ${modulemapPath} not found`,
+      );
+    }
+
+    // Move from temp to final location
+    console.log('Preparing the final location', finalLocation);
+    fs.rmSync(finalLocation, {force: true, recursive: true});
+
+    // Use mv for an atomic-ish replacement. If the final location is on the
+    // same filesystem as tmpDir this is a rename; otherwise it falls back to
+    // copy + delete via spawnSync.
+    const mvResult = spawnSync('mv', [tmpExtractDir, finalLocation], {
+      stdio: 'inherit',
+    });
+
+    if (mvResult.status !== 0) {
+      // Fallback: copy recursively then remove temp
+      console.log('mv failed, falling back to cp -R');
+      fs.mkdirSync(finalLocation, {recursive: true});
+      const cpResult = spawnSync(
+        'cp',
+        ['-R', tmpExtractDir + '/.', finalLocation],
+        {stdio: 'inherit'},
+      );
+      if (cpResult.status !== 0) {
+        throw new Error(`cp fallback failed with exit code ${cpResult.status}`);
+      }
+    }
+  } finally {
+    // Clean up temp directory
+    fs.rmSync(tmpDir, {force: true, recursive: true});
+  }
 }
 
 function updateLastBuildConfiguration(configuration /*: string */) {

package/settings.gradle.kts

@@ -47,8 +47,28 @@ buildscript {
   val properties = java.util.Properties()
   val propertiesToInherit = listOf("hermesV1Enabled", "react.hermesV1Enabled")
 
+  // We cannot assume that the node_modules are next to the android project, for example
+  // in monorepos, they might get hoisted.
+  // In a composite build, this included build can access the invoking (consumer) build
+  // via `gradle.parent`. We use its StartParameter to locate the app's `gradle.properties`:
+  // - `projectDir/gradle.properties` when Gradle is run with `-p <androidDir>`
+  // - `currentDir/gradle.properties` when run from the app android folder
+  // If neither exists, we keep the legacy RN fallback path below.
+
+  val parentGradle = gradle.parent
+  val parentProjectDir = parentGradle?.startParameter?.projectDir
+  val parentCurrentDir = parentGradle?.startParameter?.currentDir
+  val gradlePropertiesCandidates =
+      listOfNotNull(
+          parentProjectDir?.resolve("gradle.properties"),
+          parentCurrentDir?.resolve("gradle.properties"),
+          // Backward-compatible fallback for classic RN app layouts.
+          file("../../android/gradle.properties"),
+      )
+
   try {
-    file("../../android/gradle.properties").inputStream().use { properties.load(it) }
+    val propertiesFile = gradlePropertiesCandidates.firstOrNull { it.exists() }
+    propertiesFile?.inputStream()?.use { properties.load(it) }
 
     gradle.rootProject {
       propertiesToInherit.forEach { property ->

package/types/public/ReactNativeTVTypes.d.ts

@@ -4,7 +4,24 @@ import type { View, ScrollViewProps, HostComponent, EventSubscription, TVParalla
 declare module 'react-native' {
   export type FocusDestination = null | number | React.Component<any, any> | React.ComponentClass<any>;
 
+  interface ScrollViewProps {
+    /**
+     * Padding applied when snapping to items using `snapToAlignment="item"`.
+     * Set on the parent scroll view, not directly on child items.
+     * Only used when `snapToAlignment` is set to `'item'`.
+     */
+    snapToItemPadding?: number | undefined;
+  }
+
   interface ViewProps {
+  /**
+   * Controls the scroll snap alignment when this view receives focus inside a ScrollView.
+   * Used with snapToAlignment="item" on the parent ScrollView.
+   *
+   * @platform tv
+   */
+  scrollSnapAlign?: 'start' | 'center' | 'end' | undefined;
+
   /**
    * Android TV only prop
    */
@@ -54,8 +71,8 @@ declare module 'react-native' {
 
   /**
    * Hardware event received from TVEventHandler
-   * 
-   * Note: The 'blur' and 'focus' event types are deprecated and will no longer be 
+   *
+   * Note: The 'blur' and 'focus' event types are deprecated and will no longer be
    * emitted on new architecture (Fabric). Use onFocus/onBlur component props instead.
    * See: https://github.com/react-native-tvos/react-native-tvos/issues/1037
    */