react-native-tvos 0.79.0-0 → 0.79.1-0

package/Libraries/Components/TV/TVEventControl.js

@@ -7,25 +7,31 @@
 
 'use strict';
 
-const TVMenuBridge = require('../../BatchedBridge/NativeModules').TVMenuBridge;
+import NativeTVNavigationEventEmitter from '../../../src/private/specs_DEPRECATED/modules/NativeTVNavigationEventEmitter';
 
 module.exports = {
   enableTVMenuKey: () => {
-    TVMenuBridge && TVMenuBridge.enableTVMenuKey();
+    NativeTVNavigationEventEmitter &&
+      NativeTVNavigationEventEmitter.enableTVMenuKey();
   },
   disableTVMenuKey: () => {
-    TVMenuBridge && TVMenuBridge.disableTVMenuKey();
+    NativeTVNavigationEventEmitter &&
+      NativeTVNavigationEventEmitter.disableTVMenuKey();
   },
   enableTVPanGesture: () => {
-    TVMenuBridge && TVMenuBridge.enableTVPanGesture();
+    NativeTVNavigationEventEmitter &&
+      NativeTVNavigationEventEmitter.enableTVPanGesture();
   },
   disableTVPanGesture: () => {
-    TVMenuBridge && TVMenuBridge.disableTVPanGesture();
+    NativeTVNavigationEventEmitter &&
+      NativeTVNavigationEventEmitter.disableTVPanGesture();
   },
   enableGestureHandlersCancelTouches: () => {
-    TVMenuBridge && TVMenuBridge.enableGestureHandlersCancelTouches();
+    NativeTVNavigationEventEmitter &&
+      NativeTVNavigationEventEmitter.enableGestureHandlersCancelTouches();
   },
   disableGestureHandlersCancelTouches: () => {
-    TVMenuBridge && TVMenuBridge.disableGestureHandlersCancelTouches();
+    NativeTVNavigationEventEmitter &&
+      NativeTVNavigationEventEmitter.disableGestureHandlersCancelTouches();
   },
 };

package/Libraries/Core/ReactNativeVersion.js

@@ -16,7 +16,7 @@ const version: $ReadOnly<{
 }> = {
   major: 0,
   minor: 79,
-  patch: 0,
+  patch: 1,
   prerelease: '0',
 };
 

package/Libraries/Utilities/BackHandler.ios.js

@@ -12,7 +12,7 @@
 // On iOS, this just implements a stub.
 
 const TVEventHandler = require('../Components/TV/TVEventHandler');
-const Platform = require('./Platform');
+const Platform = require('./Platform').default;
 
 type BackPressEventName = 'backPress' | 'hardwareBackPress';
 type BackPressHandler = () => ?boolean;

package/README.md

@@ -148,7 +148,7 @@ npx react-native run:android --device tv_api_31
 
 ## How to support TV specific file extensions
 
-The template contains an [example Metro configuration](./packages/react-native/template/metro.config.js) that allows Metro to resolve application source files with TV-specific code, indicated by specific file extensions (e.g. `*.ios.tv.tsx`, `*.android.tv.tsx`, `*.tv.tsx`). The config will work the same way with the other standard source file extensions (`.js`, etc.), as documented in [Metro docs](https://metrobundler.dev/docs/configuration/#sourceexts)
+The template contains an [example Metro configuration](https://github.com/react-native-tvos/react-native-template-typescript-tv/blob/main/template/metro.config.js) that allows Metro to resolve application source files with TV-specific code, indicated by specific file extensions (e.g. `*.ios.tv.tsx`, `*.android.tv.tsx`, `*.tv.tsx`). The config will work the same way with the other standard source file extensions (`.js`, etc.), as documented in [Metro docs](https://metrobundler.dev/docs/configuration/#sourceexts)
 
 When this is enabled, Metro will resolve files in the following order of preference (and similarly for the other supported file extensions):
 
@@ -190,7 +190,7 @@ Code has been added to detect focus changes and use existing methods to style th
 
 Because focus and blur events are now fully native core events, they will respond correctly to capturing and bubbling event handlers in `View` components. A demo of this has been added to the TVEventHandlerExample in RNTester.
 
-- _Tailwind styles for Pressable and Touchable controls_: The above events allow RNTV to support the [`focus:` and `active:` pseudo classes for Tailwind styles](https://www.nativewind.dev/v4/core-concepts/states#hover-focus-and-active-).
+- _Tailwind styles for Pressable and Touchable controls_: The above events allow RNTV to support the [`focus:` and `active:` pseudo classes for Tailwind styles](https://www.nativewind.dev/core-concepts/states#hover-focus-and-active-).
 
 - _TV remote/keyboard input_: Application code that needs to implement custom handling of TV remote events can create an instance of `TVEventHandler` and listen for these events.  For a more convenient API, we provide `useTVEventHandler`.
 

package/React/Base/RCTVersion.m

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

package/React/CoreModules/RCTTVNavigationEventEmitter.mm

@@ -8,6 +8,7 @@
 #import "RCTTVNavigationEventEmitter.h"
 #if TARGET_OS_TV
 #import "RCTTVNavigationEventNotificationConstants.h"
+#import <React/RCTTVRemoteHandler.h>
 #endif
 
 #import <FBReactNativeSpec/FBReactNativeSpec.h>
@@ -55,6 +56,43 @@ RCT_EXPORT_MODULE()
   return std::make_shared<facebook::react::NativeTVNavigationEventEmitterSpecJSI>(params);
 }
 
+#pragma mark -
+#pragma mark Methods moved from old RCTTVMenuBridge
+
+RCT_EXPORT_METHOD(enableTVMenuKey)
+{
+    [RCTTVRemoteHandler setUseMenuKey:YES];
+    [[NSNotificationCenter defaultCenter] postNotificationName:RCTTVEnableMenuKeyNotification object:nil];
+}
+
+RCT_EXPORT_METHOD(disableTVMenuKey)
+{
+    [RCTTVRemoteHandler setUseMenuKey:NO];
+    [[NSNotificationCenter defaultCenter] postNotificationName:RCTTVDisableMenuKeyNotification object:nil];
+}
+
+RCT_EXPORT_METHOD(enableTVPanGesture)
+{
+    [RCTTVRemoteHandler setUsePanGesture:YES];
+    [[NSNotificationCenter defaultCenter] postNotificationName:RCTTVEnablePanGestureNotification object:nil];
+}
+
+RCT_EXPORT_METHOD(disableTVPanGesture)
+{
+    [RCTTVRemoteHandler setUsePanGesture:NO];
+    [[NSNotificationCenter defaultCenter] postNotificationName:RCTTVDisablePanGestureNotification object:nil];
+}
+
+RCT_EXPORT_METHOD(enableGestureHandlersCancelTouches) {
+  [RCTTVRemoteHandler setGestureHandlersCancelTouches:YES];
+  [[NSNotificationCenter defaultCenter] postNotificationName:RCTTVEnableGestureHandlersCancelTouchesNotification object:nil];
+}
+
+RCT_EXPORT_METHOD(disableGestureHandlersCancelTouches) {
+  [RCTTVRemoteHandler setGestureHandlersCancelTouches:NO];
+  [[NSNotificationCenter defaultCenter] postNotificationName:RCTTVDisableGestureHandlersCancelTouchesNotification object:nil];
+}
+
 @end
 
 Class RCTTVNavigationEventEmitterCls(void)

package/React/FBReactNativeSpec/FBReactNativeSpec/FBReactNativeSpec-generated.mm

@@ -2198,6 +2198,30 @@ namespace facebook::react {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, VoidKind, "removeListeners", @selector(removeListeners:), args, count);
     }
 
+    static facebook::jsi::Value __hostFunction_NativeTVNavigationEventEmitterSpecJSI_enableTVMenuKey(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+      return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, VoidKind, "enableTVMenuKey", @selector(enableTVMenuKey), args, count);
+    }
+
+    static facebook::jsi::Value __hostFunction_NativeTVNavigationEventEmitterSpecJSI_disableTVMenuKey(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+      return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, VoidKind, "disableTVMenuKey", @selector(disableTVMenuKey), args, count);
+    }
+
+    static facebook::jsi::Value __hostFunction_NativeTVNavigationEventEmitterSpecJSI_enableTVPanGesture(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+      return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, VoidKind, "enableTVPanGesture", @selector(enableTVPanGesture), args, count);
+    }
+
+    static facebook::jsi::Value __hostFunction_NativeTVNavigationEventEmitterSpecJSI_disableTVPanGesture(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+      return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, VoidKind, "disableTVPanGesture", @selector(disableTVPanGesture), args, count);
+    }
+
+    static facebook::jsi::Value __hostFunction_NativeTVNavigationEventEmitterSpecJSI_enableGestureHandlersCancelTouches(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+      return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, VoidKind, "enableGestureHandlersCancelTouches", @selector(enableGestureHandlersCancelTouches), args, count);
+    }
+
+    static facebook::jsi::Value __hostFunction_NativeTVNavigationEventEmitterSpecJSI_disableGestureHandlersCancelTouches(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+      return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, VoidKind, "disableGestureHandlersCancelTouches", @selector(disableGestureHandlersCancelTouches), args, count);
+    }
+
   NativeTVNavigationEventEmitterSpecJSI::NativeTVNavigationEventEmitterSpecJSI(const ObjCTurboModule::InitParams &params)
     : ObjCTurboModule(params) {
       
@@ -2206,6 +2230,24 @@ namespace facebook::react {
         
         methodMap_["removeListeners"] = MethodMetadata {1, __hostFunction_NativeTVNavigationEventEmitterSpecJSI_removeListeners};
         
+        
+        methodMap_["enableTVMenuKey"] = MethodMetadata {0, __hostFunction_NativeTVNavigationEventEmitterSpecJSI_enableTVMenuKey};
+        
+        
+        methodMap_["disableTVMenuKey"] = MethodMetadata {0, __hostFunction_NativeTVNavigationEventEmitterSpecJSI_disableTVMenuKey};
+        
+        
+        methodMap_["enableTVPanGesture"] = MethodMetadata {0, __hostFunction_NativeTVNavigationEventEmitterSpecJSI_enableTVPanGesture};
+        
+        
+        methodMap_["disableTVPanGesture"] = MethodMetadata {0, __hostFunction_NativeTVNavigationEventEmitterSpecJSI_disableTVPanGesture};
+        
+        
+        methodMap_["enableGestureHandlersCancelTouches"] = MethodMetadata {0, __hostFunction_NativeTVNavigationEventEmitterSpecJSI_enableGestureHandlersCancelTouches};
+        
+        
+        methodMap_["disableGestureHandlersCancelTouches"] = MethodMetadata {0, __hostFunction_NativeTVNavigationEventEmitterSpecJSI_disableGestureHandlersCancelTouches};
+        
   }
 } // namespace facebook::react
 

package/React/FBReactNativeSpec/FBReactNativeSpec/FBReactNativeSpec.h

@@ -2022,6 +2022,12 @@ namespace facebook::react {
 
 - (void)addListener:(NSString *)eventName;
 - (void)removeListeners:(double)count;
+- (void)enableTVMenuKey;
+- (void)disableTVMenuKey;
+- (void)enableTVPanGesture;
+- (void)disableTVPanGesture;
+- (void)enableGestureHandlersCancelTouches;
+- (void)disableGestureHandlersCancelTouches;
 
 @end
 

package/React/FBReactNativeSpec/FBReactNativeSpecJSI-generated.cpp

@@ -2414,11 +2414,53 @@ static jsi::Value __hostFunction_NativeTVNavigationEventEmitterCxxSpecJSI_remove
   );
   return jsi::Value::undefined();
 }
+static jsi::Value __hostFunction_NativeTVNavigationEventEmitterCxxSpecJSI_enableTVMenuKey(jsi::Runtime &rt, TurboModule &turboModule, const jsi::Value* args, size_t count) {
+  static_cast<NativeTVNavigationEventEmitterCxxSpecJSI *>(&turboModule)->enableTVMenuKey(
+    rt
+  );
+  return jsi::Value::undefined();
+}
+static jsi::Value __hostFunction_NativeTVNavigationEventEmitterCxxSpecJSI_disableTVMenuKey(jsi::Runtime &rt, TurboModule &turboModule, const jsi::Value* args, size_t count) {
+  static_cast<NativeTVNavigationEventEmitterCxxSpecJSI *>(&turboModule)->disableTVMenuKey(
+    rt
+  );
+  return jsi::Value::undefined();
+}
+static jsi::Value __hostFunction_NativeTVNavigationEventEmitterCxxSpecJSI_enableTVPanGesture(jsi::Runtime &rt, TurboModule &turboModule, const jsi::Value* args, size_t count) {
+  static_cast<NativeTVNavigationEventEmitterCxxSpecJSI *>(&turboModule)->enableTVPanGesture(
+    rt
+  );
+  return jsi::Value::undefined();
+}
+static jsi::Value __hostFunction_NativeTVNavigationEventEmitterCxxSpecJSI_disableTVPanGesture(jsi::Runtime &rt, TurboModule &turboModule, const jsi::Value* args, size_t count) {
+  static_cast<NativeTVNavigationEventEmitterCxxSpecJSI *>(&turboModule)->disableTVPanGesture(
+    rt
+  );
+  return jsi::Value::undefined();
+}
+static jsi::Value __hostFunction_NativeTVNavigationEventEmitterCxxSpecJSI_enableGestureHandlersCancelTouches(jsi::Runtime &rt, TurboModule &turboModule, const jsi::Value* args, size_t count) {
+  static_cast<NativeTVNavigationEventEmitterCxxSpecJSI *>(&turboModule)->enableGestureHandlersCancelTouches(
+    rt
+  );
+  return jsi::Value::undefined();
+}
+static jsi::Value __hostFunction_NativeTVNavigationEventEmitterCxxSpecJSI_disableGestureHandlersCancelTouches(jsi::Runtime &rt, TurboModule &turboModule, const jsi::Value* args, size_t count) {
+  static_cast<NativeTVNavigationEventEmitterCxxSpecJSI *>(&turboModule)->disableGestureHandlersCancelTouches(
+    rt
+  );
+  return jsi::Value::undefined();
+}
 
 NativeTVNavigationEventEmitterCxxSpecJSI::NativeTVNavigationEventEmitterCxxSpecJSI(std::shared_ptr<CallInvoker> jsInvoker)
   : TurboModule("TVNavigationEventEmitter", jsInvoker) {
   methodMap_["addListener"] = MethodMetadata {1, __hostFunction_NativeTVNavigationEventEmitterCxxSpecJSI_addListener};
   methodMap_["removeListeners"] = MethodMetadata {1, __hostFunction_NativeTVNavigationEventEmitterCxxSpecJSI_removeListeners};
+  methodMap_["enableTVMenuKey"] = MethodMetadata {0, __hostFunction_NativeTVNavigationEventEmitterCxxSpecJSI_enableTVMenuKey};
+  methodMap_["disableTVMenuKey"] = MethodMetadata {0, __hostFunction_NativeTVNavigationEventEmitterCxxSpecJSI_disableTVMenuKey};
+  methodMap_["enableTVPanGesture"] = MethodMetadata {0, __hostFunction_NativeTVNavigationEventEmitterCxxSpecJSI_enableTVPanGesture};
+  methodMap_["disableTVPanGesture"] = MethodMetadata {0, __hostFunction_NativeTVNavigationEventEmitterCxxSpecJSI_disableTVPanGesture};
+  methodMap_["enableGestureHandlersCancelTouches"] = MethodMetadata {0, __hostFunction_NativeTVNavigationEventEmitterCxxSpecJSI_enableGestureHandlersCancelTouches};
+  methodMap_["disableGestureHandlersCancelTouches"] = MethodMetadata {0, __hostFunction_NativeTVNavigationEventEmitterCxxSpecJSI_disableGestureHandlersCancelTouches};
 }
 static jsi::Value __hostFunction_NativeVibrationCxxSpecJSI_getConstants(jsi::Runtime &rt, TurboModule &turboModule, const jsi::Value* args, size_t count) {
   return static_cast<NativeVibrationCxxSpecJSI *>(&turboModule)->getConstants(

package/React/FBReactNativeSpec/FBReactNativeSpecJSI.h

@@ -6632,6 +6632,12 @@ protected:
 public:
   virtual void addListener(jsi::Runtime &rt, jsi::String eventName) = 0;
   virtual void removeListeners(jsi::Runtime &rt, double count) = 0;
+  virtual void enableTVMenuKey(jsi::Runtime &rt) = 0;
+  virtual void disableTVMenuKey(jsi::Runtime &rt) = 0;
+  virtual void enableTVPanGesture(jsi::Runtime &rt) = 0;
+  virtual void disableTVPanGesture(jsi::Runtime &rt) = 0;
+  virtual void enableGestureHandlersCancelTouches(jsi::Runtime &rt) = 0;
+  virtual void disableGestureHandlersCancelTouches(jsi::Runtime &rt) = 0;
 
 };
 
@@ -6678,6 +6684,54 @@ private:
       return bridging::callFromJs<void>(
           rt, &T::removeListeners, jsInvoker_, instance_, std::move(count));
     }
+    void enableTVMenuKey(jsi::Runtime &rt) override {
+      static_assert(
+          bridging::getParameterCount(&T::enableTVMenuKey) == 1,
+          "Expected enableTVMenuKey(...) to have 1 parameters");
+
+      return bridging::callFromJs<void>(
+          rt, &T::enableTVMenuKey, jsInvoker_, instance_);
+    }
+    void disableTVMenuKey(jsi::Runtime &rt) override {
+      static_assert(
+          bridging::getParameterCount(&T::disableTVMenuKey) == 1,
+          "Expected disableTVMenuKey(...) to have 1 parameters");
+
+      return bridging::callFromJs<void>(
+          rt, &T::disableTVMenuKey, jsInvoker_, instance_);
+    }
+    void enableTVPanGesture(jsi::Runtime &rt) override {
+      static_assert(
+          bridging::getParameterCount(&T::enableTVPanGesture) == 1,
+          "Expected enableTVPanGesture(...) to have 1 parameters");
+
+      return bridging::callFromJs<void>(
+          rt, &T::enableTVPanGesture, jsInvoker_, instance_);
+    }
+    void disableTVPanGesture(jsi::Runtime &rt) override {
+      static_assert(
+          bridging::getParameterCount(&T::disableTVPanGesture) == 1,
+          "Expected disableTVPanGesture(...) to have 1 parameters");
+
+      return bridging::callFromJs<void>(
+          rt, &T::disableTVPanGesture, jsInvoker_, instance_);
+    }
+    void enableGestureHandlersCancelTouches(jsi::Runtime &rt) override {
+      static_assert(
+          bridging::getParameterCount(&T::enableGestureHandlersCancelTouches) == 1,
+          "Expected enableGestureHandlersCancelTouches(...) to have 1 parameters");
+
+      return bridging::callFromJs<void>(
+          rt, &T::enableGestureHandlersCancelTouches, jsInvoker_, instance_);
+    }
+    void disableGestureHandlersCancelTouches(jsi::Runtime &rt) override {
+      static_assert(
+          bridging::getParameterCount(&T::disableGestureHandlersCancelTouches) == 1,
+          "Expected disableGestureHandlersCancelTouches(...) to have 1 parameters");
+
+      return bridging::callFromJs<void>(
+          rt, &T::disableGestureHandlersCancelTouches, jsInvoker_, instance_);
+    }
 
   private:
     friend class NativeTVNavigationEventEmitterCxxSpec;

package/React/Fabric/Mounting/ComponentViews/TextInput/RCTTextInputComponentView.mm

@@ -706,6 +706,11 @@ static NSSet<NSNumber *> *returnKeyTypesSet;
 }
 
 - (void)_restoreTextSelection
+{
+  [self _restoreTextSelectionAndIgnoreCaretChange:NO];
+}
+
+- (void)_restoreTextSelectionAndIgnoreCaretChange:(BOOL)ignore
 {
   const auto &selection = static_cast<const TextInputProps &>(*_props).selection;
   if (!selection.has_value()) {
@@ -715,6 +720,9 @@ static NSSet<NSNumber *> *returnKeyTypesSet;
                                                    offset:selection->start];
   auto end = [_backedTextInputView positionFromPosition:_backedTextInputView.beginningOfDocument offset:selection->end];
   auto range = [_backedTextInputView textRangeFromPosition:start toPosition:end];
+  if (ignore && range.empty) {
+    return;
+  }
   [_backedTextInputView setSelectedTextRange:range notifyDelegate:YES];
 }
 
@@ -729,19 +737,20 @@ static NSSet<NSNumber *> *returnKeyTypesSet;
   // Updating the UITextView attributedText, for example changing the lineHeight, the color or adding
   // a new paragraph with \n, causes the cursor to move to the end of the Text and scroll.
   // This is fixed by restoring the cursor position and scrolling to that position (iOS issue 652653).
-  if (selectedRange.empty) {
-    // Maintaining a cursor position relative to the end of the old text.
-    NSInteger offsetStart = [_backedTextInputView offsetFromPosition:_backedTextInputView.beginningOfDocument
-                                                          toPosition:selectedRange.start];
-    NSInteger offsetFromEnd = oldTextLength - offsetStart;
-    NSInteger newOffset = attributedString.string.length - offsetFromEnd;
-    UITextPosition *position = [_backedTextInputView positionFromPosition:_backedTextInputView.beginningOfDocument
-                                                                   offset:newOffset];
-    [_backedTextInputView setSelectedTextRange:[_backedTextInputView textRangeFromPosition:position toPosition:position]
-                                notifyDelegate:YES];
-    [_backedTextInputView scrollRangeToVisible:NSMakeRange(offsetStart, 0)];
-  }
-  [self _restoreTextSelection];
+  // Maintaining a cursor position relative to the end of the old text.
+  NSInteger offsetStart = [_backedTextInputView offsetFromPosition:_backedTextInputView.beginningOfDocument
+                                                        toPosition:selectedRange.start];
+  NSInteger offsetFromEnd = oldTextLength - offsetStart;
+  NSInteger newOffset = attributedString.string.length - offsetFromEnd;
+  UITextPosition *position = [_backedTextInputView positionFromPosition:_backedTextInputView.beginningOfDocument
+                                                                 offset:newOffset];
+  [_backedTextInputView setSelectedTextRange:[_backedTextInputView textRangeFromPosition:position toPosition:position]
+                              notifyDelegate:YES];
+  [_backedTextInputView scrollRangeToVisible:NSMakeRange(offsetStart, 0)];
+
+  // A zero-length selection range can cause the caret position to change on iOS,
+  // and we have already updated the caret position, so we can safely ignore caret changing in this place.
+  [self _restoreTextSelectionAndIgnoreCaretChange:YES];
   [self _updateTypingAttributes];
   _lastStringStateWasUpdatedWith = attributedString;
 }

package/React/Modules/RCTEventEmitter.m

@@ -67,7 +67,7 @@
                               method:@"emit"
                             withArgs:body ? @[ eventName, body ] : @[ eventName ]];
   } else {
-    RCTLogWarn(@"Sending `%@` with no listeners registered.", eventName);
+    RCTLogInfo(@"Sending `%@` with no listeners registered.", eventName);
   }
 }
 

package/ReactAndroid/gradle.properties

@@ -1,4 +1,4 @@
-VERSION_NAME=0.79.0-0
+VERSION_NAME=0.79.1-0
 react.internal.publishingGroup=io.github.react-native-tvos
 
 android.useAndroidX=true

package/ReactAndroid/publish.gradle

@@ -20,7 +20,7 @@ def sonatypeUsername = findProperty('SONATYPE_USERNAME')
 def sonatypePassword = findProperty('SONATYPE_PASSWORD')
 
 def reactAndroidProjectDir = project(':packages:react-native:ReactAndroid').projectDir
-def mavenTempLocalUrl = 'file:///var/folders/xp/yw_lp59x05d2mp0g0n2f_d240000gn/T/eas-build-workingdir/build/maven_local'
+def mavenTempLocalUrl = 'file:///Users/expo/workingdir/build/maven_local'
 // Rewritten when copying this to ReactAndroid/publish.gradle
 
 publishing {

package/ReactAndroid/src/main/java/com/facebook/react/devsupport/ReleaseDevSupportManager.kt

@@ -11,6 +11,7 @@ import android.app.Activity
 import android.util.Pair
 import android.view.View
 import com.facebook.react.bridge.DefaultJSExceptionHandler
+import com.facebook.react.bridge.JSExceptionHandler
 import com.facebook.react.bridge.ReactContext
 import com.facebook.react.bridge.ReadableArray
 import com.facebook.react.common.SurfaceDelegate
@@ -34,7 +35,7 @@ import java.io.File
  */
 public open class ReleaseDevSupportManager : DevSupportManager {
 
-  private val defaultJSExceptionHandler: DefaultJSExceptionHandler = DefaultJSExceptionHandler()
+  private val defaultJSExceptionHandler: JSExceptionHandler = DefaultJSExceptionHandler()
 
   public override fun showNewJavaError(message: String?, e: Throwable?): Unit = Unit
 

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", 79,
-      "patch", 0,
+      "patch", 1,
       "prerelease", "0");
 }

package/ReactCommon/cxxreact/ReactNativeVersion.h

@@ -17,7 +17,7 @@ namespace facebook::react {
 constexpr struct {
   int32_t Major = 0;
   int32_t Minor = 79;
-  int32_t Patch = 0;
+  int32_t Patch = 1;
   std::string_view Prerelease = "0";
 } ReactNativeVersion;
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-tvos",
-  "version": "0.79.0-0",
+  "version": "0.79.1-0",
   "description": "A framework for building native apps using React",
   "license": "MIT",
   "repository": {
@@ -112,12 +112,12 @@
   },
   "dependencies": {
     "@jest/create-cache-key-function": "^29.7.0",
-    "@react-native/assets-registry": "0.79.0",
-    "@react-native/codegen": "0.79.0",
-    "@react-native/community-cli-plugin": "0.79.0",
-    "@react-native/gradle-plugin": "0.79.0",
-    "@react-native/js-polyfills": "0.79.0",
-    "@react-native/normalize-colors": "0.79.0",
+    "@react-native/assets-registry": "0.79.1",
+    "@react-native/codegen": "0.79.1",
+    "@react-native/community-cli-plugin": "0.79.1",
+    "@react-native/gradle-plugin": "0.79.1",
+    "@react-native/js-polyfills": "0.79.1",
+    "@react-native/normalize-colors": "0.79.1",
     "abort-controller": "^3.0.0",
     "anser": "^1.4.9",
     "ansi-regex": "^5.0.0",
@@ -146,7 +146,7 @@
     "whatwg-fetch": "^3.0.0",
     "ws": "^6.2.3",
     "yargs": "^17.6.2",
-    "@react-native-tvos/virtualized-lists": "0.79.0-0"
+    "@react-native-tvos/virtualized-lists": "0.79.1-0"
   },
   "codegenConfig": {
     "libraries": [

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

@@ -1082,19 +1082,19 @@ function execute(projectRoot, targetPlatform, baseOutputPath, source) {
         platform,
       );
 
-      if (source === 'app') {
-        // These components are only required by apps, not by libraries
+      if (source === 'app' && platform !== 'android') {
+        // These components are only required by apps, not by libraries. They are also Apple specific.
         generateRCTThirdPartyComponents(libraries, outputPath);
         generateRCTModuleProviders(projectRoot, pkgJson, libraries, outputPath);
         generateCustomURLHandlers(libraries, outputPath);
         generateAppDependencyProvider(outputPath);
+        generateReactCodegenPodspec(
+          projectRoot,
+          pkgJson,
+          outputPath,
+          baseOutputPath,
+        );
       }
-      generateReactCodegenPodspec(
-        projectRoot,
-        pkgJson,
-        outputPath,
-        baseOutputPath,
-      );
 
       cleanupEmptyFilesAndFolders(outputPath);
     }

package/src/private/specs_DEPRECATED/modules/NativeTVNavigationEventEmitter.js

@@ -15,6 +15,12 @@ import * as TurboModuleRegistry from '../../../../Libraries/TurboModule/TurboMod
 export interface Spec extends TurboModule {
   +addListener: (eventName: string) => void;
   +removeListeners: (count: number) => void;
+  +enableTVMenuKey: () => void;
+  +disableTVMenuKey: () => void;
+  +enableTVPanGesture: () => void;
+  +disableTVPanGesture: () => void;
+  +enableGestureHandlersCancelTouches: () => void;
+  +disableGestureHandlersCancelTouches: () => void;
 }
 
 export default (TurboModuleRegistry.get<Spec>('TVNavigationEventEmitter'): ?Spec);

package/React/Modules/RCTTVMenuBridge.h

@@ -1,16 +0,0 @@
-//
-//  RCTTVMenuBridge.h
-//
-//  Created by Douglas Lowder on 6/4/19.
-//
-
-#import <UIKit/UIKit.h>
-#import <React/RCTBridgeModule.h>
-
-NS_ASSUME_NONNULL_BEGIN
-
-@interface RCTTVMenuBridge : NSObject <RCTBridgeModule>
-
-@end
-
-NS_ASSUME_NONNULL_END

package/React/Modules/RCTTVMenuBridge.m

@@ -1,49 +0,0 @@
-//
-//  RCTTVMenuBridge.m
-//
-//  Created by Douglas Lowder on 6/4/19.
-//
-
-#import "RCTTVMenuBridge.h"
-#import <React/RCTRootView.h>
-#import <React/RCTTVRemoteHandler.h>
-
-@implementation RCTTVMenuBridge
-
-RCT_EXPORT_MODULE();
-
-RCT_EXPORT_METHOD(enableTVMenuKey)
-{
-    [RCTTVRemoteHandler setUseMenuKey:YES];
-    [[NSNotificationCenter defaultCenter] postNotificationName:RCTTVEnableMenuKeyNotification object:nil];
-}
-
-RCT_EXPORT_METHOD(disableTVMenuKey)
-{
-    [RCTTVRemoteHandler setUseMenuKey:NO];
-    [[NSNotificationCenter defaultCenter] postNotificationName:RCTTVDisableMenuKeyNotification object:nil];
-}
-
-RCT_EXPORT_METHOD(enableTVPanGesture)
-{
-    [RCTTVRemoteHandler setUsePanGesture:YES];
-    [[NSNotificationCenter defaultCenter] postNotificationName:RCTTVEnablePanGestureNotification object:nil];
-}
-
-RCT_EXPORT_METHOD(disableTVPanGesture)
-{
-    [RCTTVRemoteHandler setUsePanGesture:NO];
-    [[NSNotificationCenter defaultCenter] postNotificationName:RCTTVDisablePanGestureNotification object:nil];
-}
-
-RCT_EXPORT_METHOD(enableGestureHandlersCancelTouches) {
-  [RCTTVRemoteHandler setGestureHandlersCancelTouches:YES];
-  [[NSNotificationCenter defaultCenter] postNotificationName:RCTTVEnableGestureHandlersCancelTouchesNotification object:nil];
-}
-
-RCT_EXPORT_METHOD(disableGestureHandlersCancelTouches) {
-  [RCTTVRemoteHandler setGestureHandlersCancelTouches:NO];
-  [[NSNotificationCenter defaultCenter] postNotificationName:RCTTVDisableGestureHandlersCancelTouchesNotification object:nil];
-}
-
-@end