react-native-tvos 0.75.2-0rc0 → 0.75.3-0

package/ReactAndroid/src/main/java/com/facebook/react/devsupport/CxxInspectorPackagerConnection.java

@@ -13,7 +13,6 @@ import androidx.annotation.Nullable;
 import com.facebook.jni.HybridData;
 import com.facebook.proguard.annotations.DoNotStrip;
 import java.io.Closeable;
-import java.util.OptionalInt;
 import java.util.concurrent.TimeUnit;
 import okhttp3.OkHttpClient;
 import okhttp3.Request;
@@ -47,7 +46,7 @@ import okhttp3.WebSocketListener;
   private static class WebSocketDelegate implements Closeable {
     private final HybridData mHybridData;
 
-    public native void didFailWithError(OptionalInt posixCode, String error);
+    public native void didFailWithError(@Nullable Integer posixCode, String error);
 
     public native void didReceiveMessage(String message);
 
@@ -103,8 +102,7 @@ import okhttp3.WebSocketListener;
                 @Override
                 public void onFailure(WebSocket _unused, Throwable t, @Nullable Response response) {
                   @Nullable String message = t.getMessage();
-                  delegate.didFailWithError(
-                      OptionalInt.empty(), message != null ? message : "<Unknown error>");
+                  delegate.didFailWithError(null, message != null ? message : "<Unknown error>");
                   // "No further calls to this listener will be made." -OkHttp docs for
                   // WebSocketListener.onFailure
                   delegate.close();

package/ReactAndroid/src/main/java/com/facebook/react/modules/systeminfo/ReactNativeVersion.java

@@ -17,6 +17,6 @@ public class ReactNativeVersion {
   public static final Map<String, Object> VERSION = MapBuilder.<String, Object>of(
       "major", 0,
       "minor", 75,
-      "patch", 2,
-      "prerelease", "0rc0");
+      "patch", 3,
+      "prerelease", "0");
 }

package/ReactAndroid/src/main/java/com/facebook/react/uimanager/drawable/CSSBackgroundDrawable.java

@@ -605,6 +605,7 @@ public class CSSBackgroundDrawable extends Drawable {
     }
 
     // Clip border ONLY if its color is non transparent
+    float pathAdjustment = 0f;
     if (Color.alpha(colorLeft) != 0
         && Color.alpha(colorTop) != 0
         && Color.alpha(colorRight) != 0
@@ -615,6 +616,10 @@ public class CSSBackgroundDrawable extends Drawable {
       mInnerClipTempRectForBorderRadius.bottom -= borderWidth.bottom;
       mInnerClipTempRectForBorderRadius.left += borderWidth.left;
       mInnerClipTempRectForBorderRadius.right -= borderWidth.right;
+
+      // only close gap between border and main path if we draw the border, otherwise
+      // we wind up pixelating small pixel-radius curves
+      pathAdjustment = mGapBetweenPaths;
     }
 
     mTempRectForCenterDrawPath.top += borderWidth.top * 0.5f;
@@ -661,10 +666,10 @@ public class CSSBackgroundDrawable extends Drawable {
     // (mInnerClipTempRectForBorderRadius), ensuring the border can be
     // drawn on top without the gap.
     mBackgroundColorRenderPath.addRoundRect(
-        mInnerClipTempRectForBorderRadius.left - mGapBetweenPaths,
-        mInnerClipTempRectForBorderRadius.top - mGapBetweenPaths,
-        mInnerClipTempRectForBorderRadius.right + mGapBetweenPaths,
-        mInnerClipTempRectForBorderRadius.bottom + mGapBetweenPaths,
+        mInnerClipTempRectForBorderRadius.left - pathAdjustment,
+        mInnerClipTempRectForBorderRadius.top - pathAdjustment,
+        mInnerClipTempRectForBorderRadius.right + pathAdjustment,
+        mInnerClipTempRectForBorderRadius.bottom + pathAdjustment,
         new float[] {
           innerTopLeftRadiusX,
           innerTopLeftRadiusY,

package/ReactAndroid/src/main/java/com/facebook/react/views/imagehelper/ImageSource.kt

@@ -23,12 +23,14 @@ constructor(
 ) {
 
   /** Get the URI for this image - can be either a parsed network URI or a resource URI. */
-  public val uri: Uri = computeUri(context)
+  public open val uri: Uri = computeUri(context)
   /** Get the area of this image. */
   public val size: Double = width * height
   /** Get whether this image source represents an Android resource or a network URI. */
-  public var isResource: Boolean = false
-    private set
+  public open val isResource: Boolean
+    get() = _isResource
+
+  private var _isResource: Boolean = false
 
   override fun equals(other: Any?): Boolean {
     if (this === other) {
@@ -58,7 +60,7 @@ constructor(
       }
 
   private fun computeLocalUri(context: Context): Uri {
-    isResource = true
+    _isResource = true
     return ResourceDrawableIdHelper.instance.getResourceDrawableUri(context, source)
   }
 

package/ReactAndroid/src/main/java/com/facebook/react/views/view/ReactViewManager.java

@@ -7,6 +7,8 @@
 
 package com.facebook.react.views.view;
 
+import android.content.Context;
+import android.content.pm.PackageManager;
 import android.graphics.Rect;
 import android.util.Log;
 import android.view.View;
@@ -85,6 +87,14 @@ public class ReactViewManager extends ReactClippingViewManager<ReactViewGroup> {
   @ReactProp(name = "accessible")
   public void setAccessible(ReactViewGroup view, boolean accessible) {
     view.setFocusable(accessible);
+    // This is required to handle Android TV/ Fire TV Devices that are Touch Enabled as well as LeanBack
+    // https://developer.android.com/reference/android/view/View#requestFocus(int,%20android.graphics.Rect)
+    // ** A view will not actually take focus if it is not focusable (isFocusable() returns false), **
+    // ** or if it is focusable and it is not focusable in touch mode (isFocusableInTouchMode()) **
+    // ** while the device is in touch mode.  **
+    if (hasTouchScreen(view.getContext())) {
+      view.setFocusableInTouchMode(accessible);
+    }
   }
 
   @ReactProp(name = "hasTVPreferredFocus")
@@ -438,6 +448,14 @@ public class ReactViewManager extends ReactClippingViewManager<ReactViewGroup> {
     root.setFocusDestinations(fd);
   }
 
+  /**
+   * Utility function to help capture Android TV/ Fire TV Devices with Touch Support
+   */
+  private boolean hasTouchScreen(Context context) {
+    PackageManager pm = context.getPackageManager();
+    return pm.hasSystemFeature(PackageManager.FEATURE_TOUCHSCREEN);
+  }
+
   @ReactProp(name = "autoFocus")
   public void setAutoFocusTV(ReactViewGroup view, boolean autoFocus) {
     view.setAutoFocusTV(autoFocus);

package/ReactAndroid/src/main/jni/react/devsupport/JCxxInspectorPackagerConnectionWebSocketDelegate.cpp

@@ -7,6 +7,8 @@
 
 #include "JCxxInspectorPackagerConnectionWebSocketDelegate.h"
 
+#include <optional>
+
 using namespace facebook::jni;
 
 namespace facebook::react::jsinspector_modern {
@@ -17,10 +19,17 @@ JCxxInspectorPackagerConnectionWebSocketDelegate::
     : cxxDelegate_(cxxDelegate) {}
 
 void JCxxInspectorPackagerConnectionWebSocketDelegate::didFailWithError(
-    alias_ref<JOptionalInt::javaobject> posixCode,
+    alias_ref<jni::JInteger> posixCode,
     const std::string& error) {
+  std::optional<int> posixCodeVal;
+
+  // Handle @Nullable JInteger param
+  if (posixCode.get() != nullptr) {
+    posixCodeVal = posixCode->intValue();
+  }
+
   if (auto delegate = cxxDelegate_.lock()) {
-    delegate->didFailWithError(*posixCode, error);
+    delegate->didFailWithError(posixCodeVal, error);
   }
 }
 

package/ReactAndroid/src/main/jni/react/devsupport/JCxxInspectorPackagerConnectionWebSocketDelegate.h

@@ -7,8 +7,6 @@
 
 #pragma once
 
-#include "JOptional.h"
-
 #include <fbjni/fbjni.h>
 #include <jsinspector-modern/InspectorPackagerConnection.h>
 
@@ -29,7 +27,7 @@ class JCxxInspectorPackagerConnectionWebSocketDelegate
       "Lcom/facebook/react/devsupport/CxxInspectorPackagerConnection$WebSocketDelegate;";
 
   void didFailWithError(
-      jni::alias_ref<JOptionalInt::javaobject> posixCode,
+      jni::alias_ref<jni::JInteger> posixCode,
       const std::string& error);
 
   void didReceiveMessage(const std::string& message);

package/ReactCommon/cxxreact/ReactNativeVersion.h

@@ -17,8 +17,8 @@ namespace facebook::react {
 constexpr struct {
   int32_t Major = 0;
   int32_t Minor = 75;
-  int32_t Patch = 2;
-  std::string_view Prerelease = "0rc0";
+  int32_t Patch = 3;
+  std::string_view Prerelease = "0";
 } ReactNativeVersion;
 
 } // namespace facebook::react

package/ReactCommon/react/renderer/components/view/BaseViewProps.cpp

@@ -62,13 +62,13 @@ BaseViewProps::BaseViewProps(
           rawProps,
           "isTVSelectable",
           sourceProps.isTVSelectable,
-          (Boolean) false)),
+          false)),
       hasTVPreferredFocus(CoreFeatures::enablePropIteratorSetter ? sourceProps.hasTVPreferredFocus : convertRawProp(
           context,
           rawProps,
           "hasTVPreferredFocus",
           sourceProps.hasTVPreferredFocus,
-          (Boolean) false)),
+          false)),
       tvParallaxProperties(CoreFeatures::enablePropIteratorSetter ? sourceProps.tvParallaxProperties : convertRawProp(
           context,
           rawProps,
@@ -104,7 +104,7 @@ BaseViewProps::BaseViewProps(
           rawProps,
           "autoFocus",
           sourceProps.autoFocus,
-          (Boolean) false)),
+          false)),
       trapFocusUp(CoreFeatures::enablePropIteratorSetter ? sourceProps.trapFocusUp : convertRawProp(
           context,
           rawProps,

package/index.js

@@ -87,7 +87,7 @@ import typeof DevSettings from './Libraries/Utilities/DevSettings';
 import typeof Dimensions from './Libraries/Utilities/Dimensions';
 import typeof PixelRatio from './Libraries/Utilities/PixelRatio';
 import typeof Platform from './Libraries/Utilities/Platform';
-import typeof TabBarIOS from './Libraries/Components/TabBarIOS/TabBarIOS';
+// import typeof TabBarIOS from './Libraries/Components/TabBarIOS/TabBarIOS';
 import typeof TVEventHandler from './Libraries/Components/TV/TVEventHandler';
 import typeof TVFocusGuideView from './Libraries/Components/TV/TVFocusGuideView';
 import typeof TVEventControl from './Libraries/Components/TV/TVEventControl';
@@ -174,7 +174,7 @@ module.exports = {
   get Switch(): Switch {
     return require('./Libraries/Components/Switch/Switch').default;
   },
-  get TabBarIOS(): TabBarIOS {
+  get TabBarIOS(): any {
     return require('./Libraries/Components/TabBarIOS/TabBarIOS');
   },
   get Text(): Text {
@@ -334,7 +334,7 @@ module.exports = {
   get TVMenuControl(): TVEventControl {
     warnOnce(
       'TVMenuControl-moved',
-      'TVMenuControl has been moved to TVEventControl, and now supports enabling/disabling both menu key events and pan gesture events.'
+      'TVMenuControl has been moved to TVEventControl, and now supports enabling/disabling both menu key events and pan gesture events.',
     );
     return require('./Libraries/Components/TV/TVEventControl');
   },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-tvos",
-  "version": "0.75.2-0rc0",
+  "version": "0.75.3-0",
   "description": "A framework for building native apps using React",
   "license": "MIT",
   "repository": {
@@ -110,21 +110,22 @@
   },
   "dependencies": {
     "@jest/create-cache-key-function": "^29.6.3",
-    "@react-native-community/cli": "14.0.0",
-    "@react-native-community/cli-platform-android": "14.0.0",
-    "@react-native-community/cli-platform-ios": "14.0.0",
-    "@react-native/assets-registry": "0.75.2",
-    "@react-native/codegen": "0.75.2",
-    "@react-native/community-cli-plugin": "0.75.2",
-    "@react-native/gradle-plugin": "0.75.2",
-    "@react-native/js-polyfills": "0.75.2",
-    "@react-native/normalize-colors": "0.75.2",
-    "@react-native-tvos/virtualized-lists": "0.75.2-0rc0",
+    "@react-native-community/cli": "14.1.0",
+    "@react-native-community/cli-platform-android": "14.1.0",
+    "@react-native-community/cli-platform-ios": "14.1.0",
+    "@react-native/assets-registry": "0.75.3",
+    "@react-native/codegen": "0.75.3",
+    "@react-native/community-cli-plugin": "0.75.3",
+    "@react-native/gradle-plugin": "0.75.3",
+    "@react-native/js-polyfills": "0.75.3",
+    "@react-native/normalize-colors": "0.75.3",
+    "@react-native-tvos/virtualized-lists": "0.75.3-0",
     "abort-controller": "^3.0.0",
     "anser": "^1.4.9",
     "ansi-regex": "^5.0.0",
     "base64-js": "^1.5.1",
     "chalk": "^4.0.0",
+    "commander": "^9.4.1",
     "event-target-shim": "^5.0.1",
     "flow-enums-runtime": "^0.0.6",
     "glob": "^7.1.1",

package/scripts/bundle.js

@@ -31,6 +31,8 @@ program
     'npx react-native config',
   )
   .option('--load-config <string>', 'JSON project config')
+  .option('--verbose', 'Additional logs', () => true, false)
+  .allowUnknownOption()
   .action(async function handleAction() {
     let config = null;
     let options = program.opts();

package/scripts/cocoapods/autolinking.rb

@@ -73,6 +73,7 @@ def list_native_modules!(config_command)
     found_pods.push({
       "configurations": configurations,
       "name": name,
+      "root": package["root"],
       "path": relative_path.to_path,
       "podspec_path": podspec_path,
       "script_phases": script_phases
@@ -168,7 +169,7 @@ def link_native_modules!(config)
 
         # Support passing in a path relative to the root of the package
         if phase["path"]
-          phase["script"] = File.read(File.expand_path(phase["path"], package[:path]))
+          phase["script"] = File.read(File.expand_path(phase["path"], package[:root]))
           phase.delete("path")
         end
 

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

@@ -225,7 +225,7 @@ function extractSupportedApplePlatforms(dependency, dependencyPath) {
   return supportedPlatformsMap;
 }
 
-function findExternalLibraries(pkgJson) {
+function findExternalLibraries(pkgJson, projectRoot) {
   const dependencies = {
     ...pkgJson.dependencies,
     ...pkgJson.devDependencies,
@@ -241,6 +241,7 @@ function findExternalLibraries(pkgJson) {
     try {
       const configFilePath = require.resolve(
         path.join(dependency, 'package.json'),
+        {paths: [projectRoot]},
       );
       const configFile = JSON.parse(fs.readFileSync(configFilePath));
       const codegenConfigFileDir = path.dirname(configFilePath);
@@ -534,7 +535,7 @@ function findCodegenEnabledLibraries(pkgJson, projectRoot) {
   } else {
     return [
       ...projectLibraries,
-      ...findExternalLibraries(pkgJson),
+      ...findExternalLibraries(pkgJson, projectRoot),
       ...findLibrariesFromReactNativeConfig(projectRoot),
     ];
   }

package/scripts/hermes/hermes-utils.js

@@ -14,7 +14,6 @@ const {execSync, spawnSync} = require('child_process');
 const fs = require('fs');
 const os = require('os');
 const path = require('path');
-const {stdin} = require('process');
 
 /*::
 type BuildType = 'dry-run' | 'release' | 'nightly' | 'prealpha';

package/sdks/hermes-engine/utils/build-ios-framework.sh

@@ -12,9 +12,9 @@ set -e
 # Given a specific target, retrieve the right architecture for it
 # $1 the target you want to build. Allowed values: iphoneos, iphonesimulator, catalyst, xros, xrsimulator
 function get_architecture {
-    if [[ $1 == "iphoneos" || $1 == "xros" || $1 == "xrsimulator" ]]; then
+    if [[ $1 == "iphoneos" || $1 == "xros" ]]; then
       echo "arm64"
-    elif [[ $1 == "iphonesimulator" ]]; then
+    elif [[ $1 == "iphonesimulator" || $1 == "xrsimulator" ]]; then
       echo "x86_64;arm64"
     elif [[ $1 == "appletvos" ]]; then
       echo "arm64"

package/types/experimental.d.ts

@@ -32,7 +32,7 @@
  * Either the import or the reference only needs to appear once, anywhere in the project.
  */
 
-import {DimensionValue} from 'react-native/Libraries/StyleSheet/StyleSheetTypes';
+import {DimensionValue} from '../Libraries/StyleSheet/StyleSheetTypes';
 
 export {};
 

package/types/public/ReactNativeTVTypes.d.ts

@@ -1,5 +1,5 @@
 import * as React from 'react';
-import type { View, ScrollViewProps, HostComponent, TVParallaxProperties, EventSubscription } from 'react-native';
+import type { View, ScrollViewProps, HostComponent, EventSubscription } from 'react-native';
 
 declare module 'react-native' {
   interface ViewProps {
@@ -63,7 +63,49 @@ declare module 'react-native' {
     } | undefined
   };
 
-  export const TVEventHandler:  {
+  export type TVParallaxProperties = {
+    /**
+     * If true, parallax effects are enabled.  Defaults to true.
+     */
+    enabled?: boolean | undefined,
+
+    /**
+     * Defaults to 2.0.
+     */
+    shiftDistanceX?: number | undefined,
+
+    /**
+     * Defaults to 2.0.
+     */
+    shiftDistanceY?: number | undefined,
+
+    /**
+     * Defaults to 0.05.
+     */
+    tiltAngle?: number | undefined,
+
+    /**
+     * Defaults to 1.0
+     */
+    magnification?: number | undefined,
+
+    /**
+     * Defaults to 1.0
+     */
+    pressMagnification?: number | undefined,
+
+    /**
+     * Defaults to 0.3
+     */
+    pressDuration?: number | undefined,
+
+    /**
+     * Defaults to 0.3
+     */
+    pressDelay?: number | undefined,
+  };
+
+  export const TVEventHandler: {
     addListener: (listener: (event: HWEvent) => void) => EventSubscription | undefined
   };
 
@@ -188,5 +230,4 @@ declare module 'react-native' {
      */
     tvParallaxProperties?: TVParallaxProperties | undefined;
   }
-
 }

package/ReactAndroid/src/main/jni/react/devsupport/JOptional.cpp

@@ -1,29 +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.
- */
-
-#include "JOptional.h"
-
-namespace facebook::react {
-
-int JOptionalInt::getAsInt() const {
-  static auto method = javaClassStatic()->getMethod<jint()>("getAsInt");
-  return method(self());
-}
-
-bool JOptionalInt::isPresent() const {
-  static auto method = javaClassStatic()->getMethod<jboolean()>("isPresent");
-  return method(self());
-}
-
-JOptionalInt::operator std::optional<int>() const {
-  if (!isPresent()) {
-    return {};
-  }
-  return getAsInt();
-}
-
-} // namespace facebook::react

package/ReactAndroid/src/main/jni/react/devsupport/JOptional.h

@@ -1,27 +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.
- */
-
-#pragma once
-
-#include <fbjni/fbjni.h>
-
-#include <optional>
-
-// TODO(moti): Consider moving this into fbjni
-
-namespace facebook::react {
-
-class JOptionalInt : public facebook::jni::JavaClass<JOptionalInt> {
- public:
-  static auto constexpr kJavaDescriptor = "Ljava/util/OptionalInt;";
-
-  int getAsInt() const;
-  bool isPresent() const;
-  operator std::optional<int>() const;
-};
-
-} // namespace facebook::react