react-native-tvos 0.83.1-0 → 0.83.2-0

package/Libraries/Core/ReactNativeVersion.js

@@ -28,7 +28,7 @@
 export default class ReactNativeVersion {
   static major: number = 0;
   static minor: number = 83;
-  static patch: number = 1;
+  static patch: number = 2;
   static prerelease: string | null = '0';
 
   static getVersionString(): string {

package/React/Base/RCTVersion.m

@@ -23,7 +23,7 @@ NSDictionary* RCTGetReactNativeVersion(void)
     __rnVersion = @{
                   RCTVersionMajor: @(0),
                   RCTVersionMinor: @(83),
-                  RCTVersionPatch: @(1),
+                  RCTVersionPatch: @(2),
                   RCTVersionPrerelease: @"0",
                   };
   });

package/React/Fabric/Mounting/ComponentViews/ScrollView/RCTScrollViewComponentView.mm

@@ -1146,13 +1146,11 @@ static inline UIViewAnimationOptions animationOptionsWithCurve(UIViewAnimationCu
     if (context.nextFocusedView == self) {
         [self becomeFirstResponder];
         [self addSwipeGestureRecognizers];
-        [self sendFocusNotification];
         // if we enter the scroll view from different view then block first touch event since it is the event that triggered the focus
         _blockFirstTouch = (unsigned long)context.focusHeading != 0;
         [self addArrowsListeners];
     } else if (context.previouslyFocusedView == self) {
         [self removeArrowsListeners];
-        [self sendBlurNotification];
         [self removeSwipeGestureRecognizers];
         [self resignFirstResponder];
         // If scrolling is enabled:
@@ -1261,16 +1259,6 @@ static inline UIViewAnimationOptions animationOptionsWithCurve(UIViewAnimationCu
     return [super shouldUpdateFocusInContext:context];
 }
 
-- (void)sendFocusNotification
-{
-    [[NSNotificationCenter defaultCenter] postNavigationFocusEventWithTag:@(self.tag) target:nil];
-}
-
-- (void)sendBlurNotification
-{
-    [[NSNotificationCenter defaultCenter] postNavigationBlurEventWithTag:@(self.tag) target:nil];
-}
-
 - (NSInteger)swipeVerticalInterval
 {
     RCTEnhancedScrollView *scrollView = (RCTEnhancedScrollView *)_scrollView;

package/React/Fabric/Mounting/ComponentViews/View/RCTViewComponentView.mm

@@ -265,16 +265,6 @@ const CGFloat BACKGROUND_COLOR_ZPOSITION = -1024.0f;
   [self handleFocusGuide];
 }
 
-- (void)sendFocusNotification:(__unused UIFocusUpdateContext *)context
-{
-    [[NSNotificationCenter defaultCenter] postNavigationFocusEventWithTag:@(self.tag) target:@(self.tag)];
-}
-
-- (void)sendBlurNotification:(__unused UIFocusUpdateContext *)context
-{
-    [[NSNotificationCenter defaultCenter] postNavigationBlurEventWithTag:@(self.tag) target:@(self.tag)];
-}
-
 - (void)sendSelectNotification
 {
   [[NSNotificationCenter defaultCenter] postNavigationPressEventWithType:RCTTVRemoteEventSelect keyAction:RCTTVRemoteEventKeyActionUp tag:@(self.tag) target:@(self.tag)];
@@ -596,7 +586,6 @@ const CGFloat BACKGROUND_COLOR_ZPOSITION = -1024.0f;
       [self enableDirectionalFocusGuides];
       [coordinator addCoordinatedAnimations:^(void){
           if (self->_eventEmitter) self->_eventEmitter->onFocus();
-          [self sendFocusNotification:context];
           [self addParallaxMotionEffects];
       } completion:^(void){}];
       // Without this check, onBlur would also trigger when `TVFocusGuideView` transfers focus to its children.
@@ -607,7 +596,6 @@ const CGFloat BACKGROUND_COLOR_ZPOSITION = -1024.0f;
       [coordinator addCoordinatedAnimations:^(void){
           [self removeParallaxMotionEffects];
           if (self->_eventEmitter) self->_eventEmitter->onBlur();
-          [self sendBlurNotification:context];
       } completion:^(void){}];
       [self resignFirstResponder];
     }
@@ -1166,7 +1154,6 @@ const CGFloat BACKGROUND_COLOR_ZPOSITION = -1024.0f;
   // `autoFocus`
   if (oldViewProps.autoFocus != newViewProps.autoFocus) {
     _autoFocus = newViewProps.autoFocus;
-    [self handleFocusGuide];
   }
 
   _trapFocusUp = newViewProps.trapFocusUp;
@@ -1228,7 +1215,7 @@ const CGFloat BACKGROUND_COLOR_ZPOSITION = -1024.0f;
       [self requestFocusSelf];
     }
   }
-
+  [self handleFocusGuide];
 #endif
 
   if (_swiftUIWrapper != nullptr) {

package/React/Views/RCTTVView.h

@@ -70,11 +70,17 @@
 
 /**
  * Send Focus Notifications to listeners
+ * @deprecated This method emits focus events to TVEventHandler, which is deprecated.
+ * Use onFocus/onBlur component props instead. Will be removed when old arch is removed.
+ * See: https://github.com/react-native-tvos/react-native-tvos/issues/1037
  */
 - (void)sendFocusNotification:(UIFocusUpdateContext *)context;
 
 /**
  * Send Blur Notifications to listeners
+ * @deprecated This method emits blur events to TVEventHandler, which is deprecated.
+ * Use onFocus/onBlur component props instead. Will be removed when old arch is removed.
+ * See: https://github.com/react-native-tvos/react-native-tvos/issues/1037
  */
 - (void)sendBlurNotification:(UIFocusUpdateContext *)context;
 

package/ReactAndroid/gradle.properties

@@ -1,4 +1,4 @@
-VERSION_NAME=0.83.1-0
+VERSION_NAME=0.83.2-0
 react.internal.publishingGroup=io.github.react-native-tvos
 react.internal.hermesPublishingGroup=com.facebook.hermes
 

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

@@ -14,7 +14,7 @@ public object ReactNativeVersion {
   public val VERSION: Map<String, Any?> = mapOf(
     "major" to 0,
     "minor" to 83,
-    "patch" to 1,
+    "patch" to 2,
     "prerelease" to "0"
   )
 }

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

@@ -1448,7 +1448,13 @@ public open class ReactViewGroup public constructor(context: Context?) :
     if (isFocusDestinationsSet) {
       val destination = findDestinationView()
 
-      if (destination != null && requestFocusViewOrAncestor(destination)) {
+      // Destination is set but there's no such element on the tree
+      // Just skip it to prevent cyclic issues.
+      if (destination == null) {
+        return false
+      }
+
+      if (destination.requestFocus()) {
         return true
       }
     }
@@ -1472,9 +1478,7 @@ public open class ReactViewGroup public constructor(context: Context?) :
       }
 
       // Try moving the focus to the first focusable element otherwise.
-      if (moveFocusToFirstFocusable(this)) {
-        return true
-      }
+      return moveFocusToFirstFocusable(this)
     }
 
     return super.requestFocus(direction, previouslyFocusedRect)
@@ -1606,21 +1610,5 @@ public open class ReactViewGroup public constructor(context: Context?) :
     fun setViewClipped(view: View, clipped: Boolean) {
       view.setTag(R.id.view_clipped, clipped)
     }
-
-    private fun requestFocusViewOrAncestor(destination: View): Boolean {
-      var v: View? = destination
-      while (v != null) {
-        if (v.requestFocus()) {
-          return true
-        }
-        val parent = v.parent
-        v = if (parent is View) {
-          parent
-        } else {
-          null
-        }
-      }
-      return false
-    }
   }
 }

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

@@ -109,13 +109,13 @@ public open class ReactViewManager : ReactClippingViewManager<ReactViewGroup>()
 
   @ReactProp(name = "tvFocusable")
   public open fun setTvFocusable(view: ReactViewGroup, focusable: Boolean) {
-    setFocusable(view, focusable)
     if (!focusable) {
       view.isFocusable = false
       view.descendantFocusability = ViewGroup.FOCUS_BLOCK_DESCENDANTS
     } else {
       view.descendantFocusability = ViewGroup.FOCUS_AFTER_DESCENDANTS
     }
+    setFocusable(view, focusable)
   }
 
   @ReactProp(name = ViewProps.ACCESSIBILITY_ORDER)

package/ReactCommon/cxxreact/ReactNativeVersion.h

@@ -14,14 +14,14 @@
 
 #define REACT_NATIVE_VERSION_MAJOR 0
 #define REACT_NATIVE_VERSION_MINOR 83
-#define REACT_NATIVE_VERSION_PATCH 1
+#define REACT_NATIVE_VERSION_PATCH 2
 
 namespace facebook::react {
 
 constexpr struct {
   int32_t Major = 0;
   int32_t Minor = 83;
-  int32_t Patch = 1;
+  int32_t Patch = 2;
   std::string_view Prerelease = "0";
 } ReactNativeVersion;
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-tvos",
-  "version": "0.83.1-0",
+  "version": "0.83.2-0",
   "description": "A framework for building native apps using React",
   "license": "MIT",
   "repository": {
@@ -91,6 +91,7 @@
     "React-Core.podspec",
     "React-Core-prebuilt.podspec",
     "react-native.config.js",
+    "tvosCommands.js",
     "React.podspec",
     "React",
     "!React/Fabric/RCTThirdPartyFabricComponentsProvider.*",
@@ -164,12 +165,12 @@
   },
   "dependencies": {
     "@jest/create-cache-key-function": "^29.7.0",
-    "@react-native/assets-registry": "0.83.1",
-    "@react-native/codegen": "0.83.1",
-    "@react-native/community-cli-plugin": "0.83.1",
-    "@react-native/gradle-plugin": "0.83.1",
-    "@react-native/js-polyfills": "0.83.1",
-    "@react-native/normalize-colors": "0.83.1",
+    "@react-native/assets-registry": "0.83.2",
+    "@react-native/codegen": "0.83.2",
+    "@react-native/community-cli-plugin": "0.83.2",
+    "@react-native/gradle-plugin": "0.83.2",
+    "@react-native/js-polyfills": "0.83.2",
+    "@react-native/normalize-colors": "0.83.2",
     "abort-controller": "^3.0.0",
     "anser": "^1.4.9",
     "ansi-regex": "^5.0.0",
@@ -179,7 +180,7 @@
     "commander": "^12.0.0",
     "flow-enums-runtime": "^0.0.6",
     "glob": "^7.1.1",
-    "hermes-compiler": "0.14.0",
+    "hermes-compiler": "0.14.1",
     "invariant": "^2.2.4",
     "jest-environment-node": "^29.7.0",
     "memoize-one": "^5.0.0",
@@ -197,7 +198,7 @@
     "whatwg-fetch": "^3.0.0",
     "ws": "^7.5.10",
     "yargs": "^17.6.2",
-    "@react-native-tvos/virtualized-lists": "0.83.1-0"
+    "@react-native-tvos/virtualized-lists": "0.83.2-0"
   },
   "codegenConfig": {
     "libraries": [

package/sdks/.hermesversion

@@ -1 +1 @@
-hermes-v0.14.0
+hermes-v0.14.1

package/sdks/hermes-engine/version.properties

@@ -1,2 +1,2 @@
-HERMES_VERSION_NAME=0.14.0
+HERMES_VERSION_NAME=0.14.1
 HERMES_V1_VERSION_NAME=250829098.0.4

package/tvosCommands.js

@@ -0,0 +1,51 @@
+/**
+ * @flow
+ */
+
+let apple;
+try {
+  apple = require('@react-native-community/cli-platform-apple');
+} catch {
+  if (verbose) {
+    console.warn(
+      '@react-native-community/cli-platform-apple not found, the react-native.config.js may be unusable.'
+    );
+  }
+}
+
+const platformName = 'tvos';
+
+const run = {
+  name: `run-${platformName}`,
+  description: 'builds your app and starts it on a tvOS simulator or Apple TV device',
+  func: apple.createRun({platformName}),
+  examples: [
+    {
+      desc: 'Run on a specific simulator',
+      cmd: `npx react-native run-${platformName} --simulator "Apple TV"`,
+    },
+  ],
+  options: apple.getRunOptions({platformName}),
+};
+
+const log = {
+  name: `log-${platformName}`,
+  description: 'displays system logs from a connected tvOS device or simulator',
+  func: apple.createLog({platformName: platformName}),
+  options: apple.getLogOptions({platformName}),
+};
+
+const build = {
+  name: `build-${platformName}`,
+  description: 'builds your app for tvOS',
+  func: apple.createBuild({platformName}),
+  examples: [
+      {
+      desc: 'Build the app for all tvOS devices in Release mode',
+      cmd: `npx react-native build-${platformName} --mode "Release"`,
+      },
+  ],
+  options: apple.getBuildOptions({platformName}),
+};
+
+module.exports = [run, log, build];

package/types/public/ReactNativeTVTypes.d.ts

@@ -52,6 +52,13 @@ declare module 'react-native' {
     disableGestureHandlersCancelTouches(): void;
   };
 
+  /**
+   * Hardware event received from TVEventHandler
+   * 
+   * 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
+   */
   export type HWEvent = {
     eventType: 'up' | 'down' | 'right' | 'left' | 'longUp' | 'longDown' | 'longRight' | 'longLeft' | 'blur' | 'focus' | 'pan' | string;
     eventKeyAction?: -1 | 1 | 0 | number | undefined;