react-native-tvos 0.81.4-0 → 0.81.5-0

package/Libraries/Components/View/ViewPropTypes.js

@@ -283,20 +283,6 @@ export type ViewPropsAndroid = $ReadOnly<{
    */
   renderToHardwareTextureAndroid?: ?boolean,
 
-  /**
-   * TV next focus forward (see documentation for the View component).
-   *
-   * @platform android
-   */
-  nextFocusForward?: ?number,
-
-  /**
-   * Whether this `View` should be focusable with a non-touch input device, eg. receive focus with a hardware keyboard.
-   *
-   * @platform android
-   */
-  focusable?: ?boolean,
-
   /**
    * Indicates whether this `View` should be focusable with a non-touch input device, eg. receive focus with a hardware keyboard.
    * See https://developer.mozilla.org/en-US/docs/Web/HTML/Global_attributes/tabindex
@@ -318,51 +304,6 @@ export type ViewPropsAndroid = $ReadOnly<{
   onClick?: ?(event: GestureResponderEvent) => mixed,
 }>;
 
-export type TVViewPropsIOS = $ReadOnly<{
-  /**
-   * *(Apple TV only)* When set to true, this view will be focusable
-   * and navigable using the Apple TV remote.
-   *
-   * @platform ios
-   */
-  isTVSelectable?: boolean,
-
-  /**
-   * *(Apple TV only)* May be set to true to force the Apple TV focus engine to move focus to this view.
-   *
-   * @platform ios
-   */
-  hasTVPreferredFocus?: boolean,
-
-  /**
-   * *(Apple TV only)* May be used to change the appearance of the Apple TV parallax effect when this view goes in or out of focus.  Defaults to 2.0.
-   *
-   * @platform ios
-   */
-  tvParallaxShiftDistanceX?: number,
-
-  /**
-   * *(Apple TV only)* May be used to change the appearance of the Apple TV parallax effect when this view goes in or out of focus.  Defaults to 2.0.
-   *
-   * @platform ios
-   */
-  tvParallaxShiftDistanceY?: number,
-
-  /**
-   * *(Apple TV only)* May be used to change the appearance of the Apple TV parallax effect when this view goes in or out of focus.  Defaults to 0.05.
-   *
-   * @platform ios
-   */
-  tvParallaxTiltAngle?: number,
-
-  /**
-   * *(Apple TV only)* May be used to change the appearance of the Apple TV parallax effect when this view goes in or out of focus.  Defaults to 1.0.
-   *
-   * @platform ios
-   */
-  tvParallaxMagnification?: number,
-}>;
-
 export type ViewPropsIOS = $ReadOnly<{
   /**
    * Whether this `View` should be rendered as a bitmap before compositing.
@@ -374,32 +315,6 @@ export type ViewPropsIOS = $ReadOnly<{
   shouldRasterizeIOS?: ?boolean,
 }>;
 
-type NextFocusProps = $ReadOnly<{
-  /**
-   * TV next focus down (see documentation for the View component).
-   *
-   */
-  nextFocusDown?: ?number,
-
-  /**
-   * TV next focus left (see documentation for the View component).
-   *
-   */
-  nextFocusLeft?: ?number,
-
-  /**
-   * TV next focus right (see documentation for the View component).
-   *
-   */
-  nextFocusRight?: ?number,
-
-  /**
-   * TV next focus up (see documentation for the View component).
-   *
-   */
-  nextFocusUp?: ?number,
-}>;
-
 type ViewBaseProps = $ReadOnly<{
   children?: React.Node,
   style?: ?ViewStyleProp,
@@ -496,6 +411,11 @@ type ViewBaseProps = $ReadOnly<{
   experimental_accessibilityOrder?: ?Array<string>,
 }>;
 
+// For compatibility with legacy types
+export type TVViewPropsIOS = $ReadOnly<{|
+  ...TVViewProps,
+|}>;
+
 export type ViewProps = $ReadOnly<{
   ...DirectEventProps,
   ...GestureResponderHandlers,
@@ -508,6 +428,5 @@ export type ViewProps = $ReadOnly<{
   ...AccessibilityProps,
   ...ViewBaseProps,
   ...TVViewProps,
-  ...NextFocusProps,
   ...PressEventProps,
 }>;

package/Libraries/Core/ReactNativeVersion.js

@@ -17,6 +17,6 @@ export const version: $ReadOnly<{
 }> = {
   major: 0,
   minor: 81,
-  patch: 4,
+  patch: 5,
   prerelease: '0',
 };

package/React/Base/RCTUtils.mm

@@ -445,7 +445,11 @@ CGSize RCTSwitchSize(void)
 #if TARGET_OS_TV
       rctSwitchSize = CGSizeMake(0.0, 0.0); // no switch on tvOS
 #else
-      rctSwitchSize = [UISwitch new].intrinsicContentSize;
+      CGSize switchSize = [UISwitch new].intrinsicContentSize;
+      // Apple does not take into account the thumb border when returning the
+      // width of the UISwitch component, so we are adding 2 pixels for the border
+      // which is not customizable and it is the same for legacy and liquid glass.
+      rctSwitchSize = CGSizeMake(switchSize.width + 2, switchSize.height);
 #endif
     });
   });

package/React/Base/RCTVersion.m

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

package/React/CoreModules/RCTDeviceInfo.mm

@@ -246,11 +246,10 @@ static NSDictionary *RCTExportedDimensions(CGFloat fontScale)
 - (void)interfaceOrientationDidChange
 {
 #if TARGET_OS_IOS && !TARGET_OS_MACCATALYST
-  UIApplication *application = RCTSharedApplication();
-  UIInterfaceOrientation nextOrientation = RCTKeyWindow().windowScene.interfaceOrientation;
+  UIWindow *window = RCTKeyWindow();
+  UIInterfaceOrientation nextOrientation = window.windowScene.interfaceOrientation;
 
-  BOOL isRunningInFullScreen =
-      CGRectEqualToRect(application.delegate.window.frame, application.delegate.window.screen.bounds);
+  BOOL isRunningInFullScreen = window ? CGRectEqualToRect(window.frame, window.screen.bounds) : YES;
   // We are catching here two situations for multitasking view:
   // a) The app is in Split View and the container gets resized -> !isRunningInFullScreen
   // b) The app changes to/from fullscreen example: App runs in slide over mode and goes into fullscreen->

package/React/Views/RCTSwitchManager.m

@@ -9,10 +9,29 @@
 #import "RCTSwitchManager.h"
 
 #import <React/RCTUIManager.h>
+#import <React/RCTUtils.h>
 #import "RCTBridge.h"
+#import "RCTShadowView.h"
 #import "RCTSwitch.h"
 #import "UIView+React.h"
 
+@interface RCTSwitchShadowView : RCTShadowView
+
+@end
+
+@implementation RCTSwitchShadowView
+
+- (instancetype)init
+{
+  if (self = [super init]) {
+    self.intrinsicContentSize = RCTSwitchSize();
+  }
+
+  return self;
+}
+
+@end
+
 @implementation RCTSwitchManager
 
 RCT_EXPORT_MODULE()
@@ -34,6 +53,11 @@ RCT_EXPORT_MODULE()
   }
 }
 
+- (RCTShadowView *)shadowView
+{
+  return [RCTSwitchShadowView new];
+}
+
 RCT_EXPORT_METHOD(setValue : (nonnull NSNumber *)viewTag toValue : (BOOL)value)
 {
   [self.bridge.uiManager addUIBlock:^(RCTUIManager *uiManager, NSDictionary<NSNumber *, UIView *> *viewRegistry) {

package/ReactAndroid/gradle.properties

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

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

@@ -21,6 +21,7 @@ import com.facebook.infer.annotation.Assertions;
 import com.facebook.infer.annotation.Nullsafe;
 import com.facebook.react.bridge.Callback;
 import com.facebook.react.bridge.ReactContext;
+import com.facebook.react.common.LifecycleState;
 import com.facebook.react.interfaces.fabric.ReactSurface;
 import com.facebook.react.internal.featureflags.ReactNativeNewArchitectureFeatureFlags;
 import com.facebook.react.modules.core.PermissionListener;
@@ -255,7 +256,7 @@ public class ReactActivityDelegate {
 
   public void onRequestPermissionsResult(
       final int requestCode, final String[] permissions, final int[] grantResults) {
-    mPermissionsCallback =
+    Callback permissionsCallback =
         args -> {
           if (mPermissionListener != null
               && mPermissionListener.onRequestPermissionsResult(
@@ -263,6 +264,29 @@ public class ReactActivityDelegate {
             mPermissionListener = null;
           }
         };
+
+    LifecycleState lifecycle;
+    if (isFabricEnabled()) {
+      ReactHost reactHost = getReactHost();
+      lifecycle = reactHost != null ? reactHost.getLifecycleState() : LifecycleState.BEFORE_CREATE;
+    } else {
+      ReactNativeHost reactNativeHost = getReactNativeHost();
+      if (!reactNativeHost.hasInstance()) {
+        lifecycle = LifecycleState.BEFORE_CREATE;
+      } else {
+        lifecycle = reactNativeHost.getReactInstanceManager().getLifecycleState();
+      }
+    }
+
+    // If the permission request didn't show a dialog to the user, we can call the callback
+    // immediately.
+    // Otherwise, we need to wait until onResume to call it.
+    if (lifecycle == LifecycleState.RESUMED) {
+      permissionsCallback.invoke();
+      return;
+    }
+
+    mPermissionsCallback = permissionsCallback;
   }
 
   protected Context getContext() {

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 81,
-    "patch" to 4,
+    "patch" to 5,
     "prerelease" to "0"
   )
 }

package/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTextShadowNode.kt

@@ -51,7 +51,7 @@ import kotlin.math.min
  * constructed in superclass.
  */
 @LegacyArchitecture(logLevel = LegacyArchitectureLogLevel.ERROR)
-public class ReactTextShadowNode
+public open class ReactTextShadowNode
 @JvmOverloads
 public constructor(reactTextViewManagerCallback: ReactTextViewManagerCallback? = null) :
     ReactBaseTextShadowNode(reactTextViewManagerCallback) {

package/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTextViewManager.kt

@@ -29,7 +29,7 @@ import java.util.HashMap
  */
 @ReactModule(name = ReactTextViewManager.REACT_CLASS)
 @OptIn(UnstableReactNativeAPI::class)
-public class ReactTextViewManager
+public open class ReactTextViewManager
 @JvmOverloads
 public constructor(
     protected var reactTextViewManagerCallback: ReactTextViewManagerCallback? = null
@@ -92,7 +92,7 @@ public constructor(
   override fun createShadowNodeInstance(): ReactTextShadowNode =
       ReactTextShadowNode(reactTextViewManagerCallback)
 
-  public fun createShadowNodeInstance(
+  public open fun createShadowNodeInstance(
       reactTextViewManagerCallback: ReactTextViewManagerCallback?
   ): ReactTextShadowNode = ReactTextShadowNode(reactTextViewManagerCallback)
 

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

@@ -70,9 +70,7 @@ import com.facebook.react.uimanager.UIManagerHelper
 import com.facebook.react.uimanager.ViewGroupDrawingOrderHelper
 import com.facebook.react.uimanager.common.UIManagerType
 import com.facebook.react.uimanager.common.ViewUtil.getUIManagerType
-import com.facebook.react.uimanager.events.BlurEvent
 import com.facebook.react.uimanager.events.EventDispatcher
-import com.facebook.react.uimanager.events.FocusEvent
 import com.facebook.react.uimanager.events.PressInEvent
 import com.facebook.react.uimanager.events.PressOutEvent
 import com.facebook.react.uimanager.style.BorderRadiusProp
@@ -738,6 +736,18 @@ public open class ReactViewGroup public constructor(context: Context?) :
     }
     super.onViewAdded(child)
   }
+  
+  override fun removeView(view: View?) {
+    if (view != null) {
+      recoverFocus(view);
+    }
+    super.removeView(view);
+  }
+
+  override fun removeViewAt(index: Int) {
+    recoverFocus(getChildAt(index));
+    super.removeViewAt(index);
+  }
 
   override fun onViewRemoved(child: View) {
     assertOnUiThread()
@@ -856,7 +866,7 @@ public open class ReactViewGroup public constructor(context: Context?) :
 
   internal fun removeViewWithSubviewClippingEnabled(view: View) {
     assertOnUiThread()
-
+    recoverFocus(view)
     check(_removeClippedSubviews)
     val allChildren = checkNotNull(allChildren)
     view.removeOnLayoutChangeListener(childrenLayoutChangeListener)
@@ -1338,29 +1348,6 @@ public open class ReactViewGroup public constructor(context: Context?) :
 
   override fun onFocusChanged(gainFocus: Boolean, direction: Int, previouslyFocusedRect: Rect?) {
     super.onFocusChanged(gainFocus, direction, previouslyFocusedRect)
-
-    val mEventDispatcher: EventDispatcher? =
-      UIManagerHelper.getEventDispatcherForReactTag(
-        this.context as ReactContext, this.id
-      )
-
-    if (mEventDispatcher == null) {
-      return
-    }
-
-    if (gainFocus) {
-      mEventDispatcher.dispatchEvent(
-        FocusEvent(
-          UIManagerHelper.getSurfaceId(this.context), this.id
-        )
-      )
-    } else {
-      mEventDispatcher.dispatchEvent(
-        BlurEvent(
-          UIManagerHelper.getSurfaceId(this.context), this.id
-        )
-      )
-    }
   }
 
   override fun onKeyDown(keyCode: Int, event: KeyEvent): Boolean {

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

@@ -98,16 +98,7 @@ public open class ReactViewManager : ReactClippingViewManager<ReactViewGroup>()
 
   @ReactProp(name = "accessible")
   public open fun setAccessible(view: ReactViewGroup, accessible: Boolean) {
-    view.isFocusable = 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.context)) {
-      view.isFocusableInTouchMode = accessible
-    }
-
+    // TODO: determine if any AxOrder changes should be put here
   }
 
   @ReactProp(name = "tvFocusable")
@@ -407,6 +398,14 @@ public open class ReactViewManager : ReactClippingViewManager<ReactViewGroup>()
       // Don't set view.setFocusable(false) because we might still want it to be focusable for
       // accessibility reasons
     }
+    // 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.context)) {
+      view.isFocusableInTouchMode = focusable
+    }
   }
 
   @ReactProp(name = ViewProps.OVERFLOW)

package/ReactAndroid/src/main/jni/react/jni/TransformHelper.cpp

@@ -39,7 +39,9 @@ void processTransform(
   }
 
   auto result = BaseViewProps::resolveTransform(
-      Size(viewWidth, viewHeight), transform, transformOrigin);
+      Size{.width = viewWidth, .height = viewHeight},
+      transform,
+      transformOrigin);
 
   // Convert from matrix of floats to double matrix
   constexpr size_t MatrixSize = std::tuple_size_v<decltype(result.matrix)>;

package/ReactCommon/cxxreact/ReactNativeVersion.h

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

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

@@ -646,9 +646,6 @@ Transform BaseViewProps::resolveTransform(
     const Transform& transform,
     const TransformOrigin& transformOrigin) {
   auto transformMatrix = Transform{};
-  if (frameSize.width == 0 && frameSize.height == 0) {
-    return transformMatrix;
-  }
 
   // transform is matrix
   if (transform.operations.size() == 1 &&