react-native-tvos 0.64.2-0 → 0.64.2-4

package/React/Modules/RCTTVMenuBridge.m

@@ -6,6 +6,7 @@
 
 #import "RCTTVMenuBridge.h"
 #import <React/RCTRootView.h>
+#import <React/RCTTVRemoteHandler.h>
 
 @implementation RCTTVMenuBridge
 
@@ -13,11 +14,13 @@ 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];
 }
 

package/React/Views/RCTFont.mm

@@ -326,7 +326,11 @@ RCT_ARRAY_CONVERTER(RCTFontVariantDescriptor)
       isCondensed = isCondensedFont(font);
     } else {
       // Not a valid font or family
+#if TARGET_OS_TV
+      RCTLogInfo(@"Unrecognized font family '%@'", familyName);
+#else
       RCTLogError(@"Unrecognized font family '%@'", familyName);
+#endif
       if ([UIFont respondsToSelector:@selector(systemFontOfSize:weight:)]) {
         font = [UIFont systemFontOfSize:fontSize weight:fontWeight];
       } else if (fontWeight > UIFontWeightRegular) {

package/React/Views/RCTModalHostView.m

@@ -49,7 +49,7 @@ RCT_NOT_IMPLEMENTED(-(instancetype)initWithCoder : coder)
     _menuButtonGestureRecognizer = [[UITapGestureRecognizer alloc] initWithTarget:self
                                                                            action:@selector(menuButtonPressed:)];
     _menuButtonGestureRecognizer.allowedPressTypes = @[ @(UIPressTypeMenu) ];
-    self.tvRemoteHandler = [RCTTVRemoteHandler new];
+    self.tvRemoteHandler = [[RCTTVRemoteHandler alloc] initWithView:self];
 #endif
     _isPresented = NO;
 
@@ -63,6 +63,11 @@ RCT_NOT_IMPLEMENTED(-(instancetype)initWithCoder : coder)
 }
 
 #if TARGET_OS_TV
+- (void)dealloc
+{
+    self.tvRemoteHandler = nil;
+}
+
 - (void)menuButtonPressed:(__unused UIGestureRecognizer *)gestureRecognizer
 {
   if (_onRequestClose) {
@@ -119,11 +124,6 @@ RCT_NOT_IMPLEMENTED(-(instancetype)initWithCoder : coder)
   [super insertReactSubview:subview atIndex:atIndex];
   [_touchHandler attachToView:subview];
 #if TARGET_OS_TV
-  for (NSString *key in [self.tvRemoteHandler.tvRemoteGestureRecognizers allKeys]) {
-    if (![key isEqualToString:RCTTVRemoteEventMenu]) {
-      [subview addGestureRecognizer:self.tvRemoteHandler.tvRemoteGestureRecognizers[key]];
-    }
-  }
   if (_onRequestClose) {
     [subview addGestureRecognizer:_menuButtonGestureRecognizer];
   }
@@ -143,9 +143,6 @@ RCT_NOT_IMPLEMENTED(-(instancetype)initWithCoder : coder)
   if (_menuButtonGestureRecognizer) {
     [subview removeGestureRecognizer:_menuButtonGestureRecognizer];
   }
-  for (UIGestureRecognizer *gr in self.tvRemoteHandler.tvRemoteGestureRecognizers) {
-    [subview removeGestureRecognizer:gr];
-  }
 #endif
   _reactSubview = nil;
 }

package/React/Views/RCTTVFocusGuideView.m

@@ -44,7 +44,7 @@
 - (void)addFocusGuide:(NSArray*)destinations {
   
   UIView *origin = [self reactSuperview];
-  if (self.focusGuide == nil) {
+  if (self.focusGuide == nil && origin != nil) {
     self.focusGuide = [UIFocusGuide new];
     [self addLayoutGuide:self.focusGuide];
     

package/ReactAndroid/gradle.properties

@@ -1,4 +1,4 @@
-VERSION_NAME=0.64.2-0
+VERSION_NAME=0.64.2-4
 GROUP=com.facebook.react
 
 POM_NAME=ReactNative

package/ReactAndroid/src/androidTest/assets/AndroidTestBundle.js

@@ -54733,17 +54733,19 @@ __d(function (global, _$$_REQUIRE, _$$_IMPORT_DEFAULT, _$$_IMPORT_ALL, module, e
 
   var React = _$$_REQUIRE(_dependencyMap[5], "react");
 
-  var StyleSheet = _$$_REQUIRE(_dependencyMap[6], "../../StyleSheet/StyleSheet");
+  var ReactNative = _$$_REQUIRE(_dependencyMap[6], "../../Renderer/shims/ReactNative");
 
-  var TVEventHandler = _$$_REQUIRE(_dependencyMap[7], "../AppleTV/TVEventHandler");
+  var StyleSheet = _$$_REQUIRE(_dependencyMap[7], "../../StyleSheet/StyleSheet");
 
-  var UIManager = _$$_REQUIRE(_dependencyMap[8], "../../ReactNative/UIManager");
+  var TVEventHandler = _$$_REQUIRE(_dependencyMap[8], "../AppleTV/TVEventHandler");
 
-  var View = _$$_REQUIRE(_dependencyMap[9], "../View/View");
+  var UIManager = _$$_REQUIRE(_dependencyMap[9], "../../ReactNative/UIManager");
 
-  var SoundManager = _$$_REQUIRE(_dependencyMap[10], "../Sound/SoundManager");
+  var View = _$$_REQUIRE(_dependencyMap[10], "../View/View");
 
-  var normalizeColor = _$$_REQUIRE(_dependencyMap[11], "../../StyleSheet/normalizeColor");
+  var SoundManager = _$$_REQUIRE(_dependencyMap[11], "../Sound/SoundManager");
+
+  var normalizeColor = _$$_REQUIRE(_dependencyMap[12], "../../StyleSheet/normalizeColor");
 
   var extractSingleTouch = function extractSingleTouch(nativeEvent) {
     var touches = nativeEvent.touches;
@@ -55227,7 +55229,7 @@ __d(function (global, _$$_REQUIRE, _$$_IMPORT_DEFAULT, _$$_IMPORT_ALL, module, e
         __self: _this2,
         __source: {
           fileName: _jsxFileName,
-          lineNumber: 956,
+          lineNumber: 957,
           columnNumber: 7
         }
       });
@@ -55241,7 +55243,7 @@ __d(function (global, _$$_REQUIRE, _$$_IMPORT_DEFAULT, _$$_IMPORT_ALL, module, e
     }
   });
   module.exports = Touchable;
-},266,[52,10,267,3,269,54,58,270,45,88,272,65],"Libraries/Components/Touchable/Touchable.js");
+},266,[52,10,267,3,269,54,91,58,270,45,88,272,65],"Libraries/Components/Touchable/Touchable.js");
 __d(function (global, _$$_REQUIRE, _$$_IMPORT_DEFAULT, _$$_IMPORT_ALL, module, exports, _dependencyMap) {
   'use strict';
 
@@ -68340,38 +68342,45 @@ __d(function (global, _$$_REQUIRE, _$$_IMPORT_DEFAULT, _$$_IMPORT_ALL, module, e
 
   var TurboModuleRegistry = _interopRequireWildcard(_$$_REQUIRE(_dependencyMap[1], "../../TurboModule/TurboModuleRegistry"));
 
-  var NativeModule = TurboModuleRegistry.getEnforcing('StatusBarManager');
+  var Platform = _$$_REQUIRE(_dependencyMap[2], "../../Utilities/Platform");
+
+  var NativeModule = Platform.isTVOS ? null : TurboModuleRegistry.getEnforcing('StatusBarManager');
   var constants = null;
   var NativeStatusBarManager = {
     getConstants: function getConstants() {
       if (constants == null) {
-        constants = NativeModule.getConstants();
+        constants = NativeModule ? NativeModule.getConstants() : {
+          HEIGHT: 0,
+          DEFAULT_BACKGROUND_COLOR: 0
+        };
       }
 
       return constants;
     },
     getHeight: function getHeight(callback) {
-      NativeModule.getHeight(callback);
+      NativeModule ? NativeModule.getHeight(callback) : callback({
+        height: 0
+      });
     },
     setNetworkActivityIndicatorVisible: function setNetworkActivityIndicatorVisible(visible) {
-      NativeModule.setNetworkActivityIndicatorVisible(visible);
+      NativeModule && NativeModule.setNetworkActivityIndicatorVisible(visible);
     },
     addListener: function addListener(eventType) {
-      NativeModule.addListener(eventType);
+      NativeModule && NativeModule.addListener(eventType);
     },
     removeListeners: function removeListeners(count) {
-      NativeModule.removeListeners(count);
+      NativeModule && NativeModule.removeListeners(count);
     },
     setStyle: function setStyle(statusBarStyle, animated) {
-      NativeModule.setStyle(statusBarStyle, animated);
+      NativeModule && NativeModule.setStyle(statusBarStyle, animated);
     },
     setHidden: function setHidden(hidden, withAnimation) {
-      NativeModule.setHidden(hidden, withAnimation);
+      NativeModule && NativeModule.setHidden(hidden, withAnimation);
     }
   };
   var _default = NativeStatusBarManager;
   exports.default = _default;
-},364,[5,7],"Libraries/Components/StatusBar/NativeStatusBarManagerIOS.js");
+},364,[5,7,3],"Libraries/Components/StatusBar/NativeStatusBarManagerIOS.js");
 __d(function (global, _$$_REQUIRE, _$$_IMPORT_DEFAULT, _$$_IMPORT_ALL, module, exports, _dependencyMap) {
   'use strict';
 
@@ -74134,6 +74143,7 @@ __d(function (global, _$$_REQUIRE, _$$_IMPORT_DEFAULT, _$$_IMPORT_ALL, module, e
     var restPropsWithDefaults = (0, _extends2.default)({}, restProps, android_rippleConfig == null ? void 0 : android_rippleConfig.viewProps, {
       accessible: accessible !== false,
       focusable: focusable !== false,
+      isTVSelectable: isTVSelectable !== false && accessible !== false,
       hitSlop: hitSlop
     });
     var config = (0, React.useMemo)(function () {
@@ -74177,7 +74187,7 @@ __d(function (global, _$$_REQUIRE, _$$_IMPORT_DEFAULT, _$$_IMPORT_ALL, module, e
 
     var pressableTVEventHandler = function pressableTVEventHandler(evt) {
       if (props.isTVSelectable !== false || props.focusable !== false) {
-        if (viewRef.current._nativeTag === evt.target) {
+        if (viewRef.current && viewRef.current._nativeTag === evt.target) {
           if ((evt == null ? void 0 : evt.eventType) === 'focus') {
             setFocused(true);
             onFocus && onFocus(evt);
@@ -74202,19 +74212,20 @@ __d(function (global, _$$_REQUIRE, _$$_IMPORT_DEFAULT, _$$_IMPORT_ALL, module, e
     (0, _useTVEventHandler.default)(pressableTVEventHandler);
     return React.createElement(_View.default, (0, _extends2.default)({}, restPropsWithDefaults, eventHandlers, {
       ref: viewRef,
-      isTVSelectable: isTVSelectable !== false && accessible !== false,
       style: typeof style === 'function' ? style({
-        pressed: pressed
+        pressed: pressed,
+        focused: focused
       }) : style,
       collapsable: false,
       __self: this,
       __source: {
         fileName: _jsxFileName,
-        lineNumber: 284,
+        lineNumber: 285,
         columnNumber: 5
       }
     }), typeof children === 'function' ? children({
-      pressed: pressed
+      pressed: pressed,
+      focused: focused
     }) : children, __DEV__ ? React.createElement(_PressabilityDebug.PressabilityDebugView, {
       color: "red",
       hitSlop: hitSlop,
@@ -101565,7 +101576,7 @@ __d(function (global, _$$_REQUIRE, _$$_IMPORT_DEFAULT, _$$_IMPORT_ALL, module, e
             columnNumber: 7
           }
         }, Platform.isTVOS ? React.createElement(RNFocusGuide, {
-          style: this.props.style,
+          style: [this.props.style, styles.focusGuideLayout],
           ref: function ref(_ref) {
             return _this._focusGuideRef = _ref;
           },
@@ -101573,7 +101584,7 @@ __d(function (global, _$$_REQUIRE, _$$_IMPORT_DEFAULT, _$$_IMPORT_ALL, module, e
           __self: this,
           __source: {
             fileName: _jsxFileName,
-            lineNumber: 46,
+            lineNumber: 56,
             columnNumber: 11
           }
         }, this.props.children) : this.props.children);
@@ -101583,6 +101594,18 @@ __d(function (global, _$$_REQUIRE, _$$_IMPORT_DEFAULT, _$$_IMPORT_ALL, module, e
     return TVFocusGuideView;
   }(React.Component);
 
+  var styles = ReactNative.StyleSheet.create({
+    focusGuideLayout: {
+      left: 0,
+      top: 0,
+      right: 0,
+      bottom: 0,
+      marginLeft: 0,
+      marginTop: 0,
+      marginRight: 0,
+      marginBottom: 0
+    }
+  });
   var RNFocusGuide = requireNativeComponent('RCTTVFocusGuideView');
   module.exports = TVFocusGuideView;
 },487,[23,24,36,38,35,229,54,1,3],"Libraries/Components/AppleTV/TVFocusGuideView.js");

package/ReactAndroid/src/main/java/com/facebook/react/ReactRootView.java

@@ -43,7 +43,6 @@ import com.facebook.react.bridge.WritableNativeMap;
 import com.facebook.react.common.annotations.VisibleForTesting;
 import com.facebook.react.config.ReactFeatureFlags;
 import com.facebook.react.modules.appregistry.AppRegistry;
-import com.facebook.react.modules.core.DeviceEventManagerModule;
 import com.facebook.react.modules.deviceinfo.DeviceInfoModule;
 import com.facebook.react.surface.ReactStage;
 import com.facebook.react.uimanager.DisplayMetricsHolder;
@@ -56,6 +55,7 @@ import com.facebook.react.uimanager.UIManagerHelper;
 import com.facebook.react.uimanager.UIManagerModule;
 import com.facebook.react.uimanager.common.UIManagerType;
 import com.facebook.react.uimanager.events.EventDispatcher;
+import com.facebook.react.modules.core.ReactAndroidHWInputDeviceHelper;
 import com.facebook.systrace.Systrace;
 
 /**
@@ -90,7 +90,7 @@ public class ReactRootView extends FrameLayout implements RootView, ReactRoot {
   private boolean mShouldLogContentAppeared;
   private @Nullable JSTouchDispatcher mJSTouchDispatcher;
   private final ReactAndroidHWInputDeviceHelper mAndroidHWInputDeviceHelper =
-      new ReactAndroidHWInputDeviceHelper(this);
+      new ReactAndroidHWInputDeviceHelper();
   private boolean mWasMeasured = false;
   private int mWidthMeasureSpec = MeasureSpec.makeMeasureSpec(0, MeasureSpec.UNSPECIFIED);
   private int mHeightMeasureSpec = MeasureSpec.makeMeasureSpec(0, MeasureSpec.UNSPECIFIED);
@@ -230,7 +230,7 @@ public class ReactRootView extends FrameLayout implements RootView, ReactRoot {
       FLog.w(TAG, "Unable to handle key event as the catalyst instance has not been attached");
       return super.dispatchKeyEvent(ev);
     }
-    mAndroidHWInputDeviceHelper.handleKeyEvent(ev);
+    mAndroidHWInputDeviceHelper.handleKeyEvent(ev, mReactInstanceManager.getCurrentReactContext());
     return super.dispatchKeyEvent(ev);
   }
 
@@ -245,7 +245,7 @@ public class ReactRootView extends FrameLayout implements RootView, ReactRoot {
       super.onFocusChanged(gainFocus, direction, previouslyFocusedRect);
       return;
     }
-    mAndroidHWInputDeviceHelper.clearFocus();
+    mAndroidHWInputDeviceHelper.clearFocus(mReactInstanceManager.getCurrentReactContext());
     super.onFocusChanged(gainFocus, direction, previouslyFocusedRect);
   }
 
@@ -260,7 +260,7 @@ public class ReactRootView extends FrameLayout implements RootView, ReactRoot {
       super.requestChildFocus(child, focused);
       return;
     }
-    mAndroidHWInputDeviceHelper.onFocusChanged(focused);
+    mAndroidHWInputDeviceHelper.onFocusChanged(focused, mReactInstanceManager.getCurrentReactContext());
     super.requestChildFocus(child, focused);
   }
 
@@ -683,10 +683,11 @@ public class ReactRootView extends FrameLayout implements RootView, ReactRoot {
 
   /* package */ void sendEvent(String eventName, @Nullable WritableMap params) {
     if (mReactInstanceManager != null) {
-      mReactInstanceManager
-          .getCurrentReactContext()
-          .getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter.class)
-          .emit(eventName, params);
+      mAndroidHWInputDeviceHelper.emitNamedEvent(
+        eventName,
+        params,
+        mReactInstanceManager.getCurrentReactContext()
+      );
     }
   }
 

package/ReactAndroid/src/main/java/com/facebook/react/{ReactAndroidHWInputDeviceHelper.java → modules/core/ReactAndroidHWInputDeviceHelper.java}

@@ -5,13 +5,16 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-package com.facebook.react;
+package com.facebook.react.modules.core;
 
 import android.view.KeyEvent;
 import android.view.View;
+
+import com.facebook.react.bridge.ReactContext;
 import com.facebook.react.bridge.WritableMap;
 import com.facebook.react.bridge.WritableNativeMap;
 import com.facebook.react.common.MapBuilder;
+
 import java.util.Map;
 
 /** Responsible for dispatching events specific for hardware inputs. */
@@ -45,47 +48,43 @@ public class ReactAndroidHWInputDeviceHelper {
    */
   private int mLastFocusedViewId = View.NO_ID;
 
-  private final ReactRootView mReactRootView;
-
-  ReactAndroidHWInputDeviceHelper(ReactRootView mReactRootView) {
-    this.mReactRootView = mReactRootView;
-  }
+  public ReactAndroidHWInputDeviceHelper() {}
 
-  /** Called from {@link ReactRootView}. This is the main place the key events are handled. */
-  public void handleKeyEvent(KeyEvent ev) {
+  /** Called from {@link com.facebook.react.ReactRootView}. This is the main place the key events are handled. */
+  public void handleKeyEvent(KeyEvent ev, ReactContext context) {
     int eventKeyCode = ev.getKeyCode();
     int eventKeyAction = ev.getAction();
     if ((eventKeyAction == KeyEvent.ACTION_UP || eventKeyAction == KeyEvent.ACTION_DOWN)
         && KEY_EVENTS_ACTIONS.containsKey(eventKeyCode)) {
-      dispatchEvent(KEY_EVENTS_ACTIONS.get(eventKeyCode), mLastFocusedViewId, eventKeyAction);
+      dispatchEvent(KEY_EVENTS_ACTIONS.get(eventKeyCode), mLastFocusedViewId, eventKeyAction, context);
     }
   }
 
-  /** Called from {@link ReactRootView} when focused view changes. */
-  public void onFocusChanged(View newFocusedView) {
+  /** Called from {@link com.facebook.react.ReactRootView} when focused view changes. */
+  public void onFocusChanged(View newFocusedView, ReactContext context) {
     if (mLastFocusedViewId == newFocusedView.getId()) {
       return;
     }
     if (mLastFocusedViewId != View.NO_ID) {
-      dispatchEvent("blur", mLastFocusedViewId);
+      dispatchEvent("blur", mLastFocusedViewId, context);
     }
     mLastFocusedViewId = newFocusedView.getId();
-    dispatchEvent("focus", newFocusedView.getId());
+    dispatchEvent("focus", newFocusedView.getId(), context);
   }
 
-  /** Called from {@link ReactRootView} when the whole view hierarchy looses focus. */
-  public void clearFocus() {
+  /** Called from {@link com.facebook.react.ReactRootView} when the whole view hierarchy looses focus. */
+  public void clearFocus(ReactContext context) {
     if (mLastFocusedViewId != View.NO_ID) {
-      dispatchEvent("blur", mLastFocusedViewId);
+      dispatchEvent("blur", mLastFocusedViewId, context);
     }
     mLastFocusedViewId = View.NO_ID;
   }
 
-  private void dispatchEvent(String eventType, int targetViewId) {
-    dispatchEvent(eventType, targetViewId, -1);
+  private void dispatchEvent(String eventType, int targetViewId, ReactContext context) {
+    dispatchEvent(eventType, targetViewId, -1, context);
   }
 
-  private void dispatchEvent(String eventType, int targetViewId, int eventKeyAction) {
+  private void dispatchEvent(String eventType, int targetViewId, int eventKeyAction, ReactContext context) {
     WritableMap event = new WritableNativeMap();
     event.putString("eventType", eventType);
     event.putInt("eventKeyAction", eventKeyAction);
@@ -93,6 +92,14 @@ public class ReactAndroidHWInputDeviceHelper {
       event.putInt("tag", targetViewId);
       event.putInt("target", targetViewId);
     }
-    mReactRootView.sendEvent("onHWKeyEvent", event);
+    emitNamedEvent("onHWKeyEvent", event, context);
   }
+
+  public void emitNamedEvent(String eventName, WritableMap event, ReactContext context) {
+    if (context != null) {
+      context.getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter.class)
+        .emit(eventName, event);
+    }
+  }
+
 }

package/ReactAndroid/src/main/java/com/facebook/react/views/modal/BUCK

@@ -19,6 +19,7 @@ rn_android_library(
         react_native_target("java/com/facebook/react/bridge:bridge"),
         react_native_target("java/com/facebook/react/common:common"),
         react_native_target("java/com/facebook/react/module/annotations:annotations"),
+        react_native_target("java/com/facebook/react/modules/core:core"),
         react_native_target("java/com/facebook/react/touch:touch"),
         react_native_target("java/com/facebook/react/uimanager:uimanager"),
         react_native_target("java/com/facebook/react/uimanager/annotations:annotations"),

package/ReactAndroid/src/main/java/com/facebook/react/views/modal/ReactModalHostView.java

@@ -12,6 +12,7 @@ import android.app.Activity;
 import android.app.Dialog;
 import android.content.Context;
 import android.content.DialogInterface;
+import android.graphics.Rect;
 import android.view.KeyEvent;
 import android.view.MotionEvent;
 import android.view.View;
@@ -23,8 +24,10 @@ import android.view.accessibility.AccessibilityEvent;
 import android.widget.FrameLayout;
 import androidx.annotation.Nullable;
 import androidx.annotation.UiThread;
+
 import com.facebook.infer.annotation.Assertions;
 import com.facebook.react.R;
+import com.facebook.react.modules.core.ReactAndroidHWInputDeviceHelper;
 import com.facebook.react.bridge.GuardedRunnable;
 import com.facebook.react.bridge.LifecycleEventListener;
 import com.facebook.react.bridge.ReactContext;
@@ -398,8 +401,14 @@ public class ReactModalHostView extends ViewGroup
 
     private final JSTouchDispatcher mJSTouchDispatcher = new JSTouchDispatcher(this);
 
+    private final ReactAndroidHWInputDeviceHelper mAndroidHWInputDeviceHelper;
+
+    private final ReactContext mReactContext;
+
     public DialogRootViewGroup(Context context) {
       super(context);
+      mReactContext = (ReactContext)context;
+      mAndroidHWInputDeviceHelper = new ReactAndroidHWInputDeviceHelper();
     }
 
     @Override
@@ -410,6 +419,18 @@ public class ReactModalHostView extends ViewGroup
       updateFirstChildView();
     }
 
+    @Override
+    protected void onFocusChanged(boolean gainFocus, int direction, Rect previouslyFocusedRect) {
+      mAndroidHWInputDeviceHelper.clearFocus(mReactContext);
+      super.onFocusChanged(gainFocus, direction, previouslyFocusedRect);
+    }
+
+    @Override
+    public void requestChildFocus(View child, View focused) {
+      mAndroidHWInputDeviceHelper.onFocusChanged(focused, mReactContext);
+      super.requestChildFocus(child, focused);
+    }
+
     private void updateFirstChildView() {
       if (getChildCount() > 0) {
         hasAdjustedSize = false;