react-native-tvos 0.82.0-0rc4 → 0.82.1-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 and Android TV)* 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

@@ -28,8 +28,8 @@
 export default class ReactNativeVersion {
   static major: number = 0;
   static minor: number = 82;
-  static patch: number = 0;
-  static prerelease: string | null = '0rc4';
+  static patch: number = 1;
+  static prerelease: string | null = '0';
 
   static getVersionString(): string {
     return `${this.major}.${this.minor}.${this.patch}${this.prerelease != null ? `-${this.prerelease}` : ''}`;

package/Libraries/Interaction/PanResponder.js

@@ -12,7 +12,6 @@
 
 import type {GestureResponderEvent} from '../Types/CoreEventTypes';
 
-const InteractionManager = require('./InteractionManager').default;
 const TouchHistoryMath = require('./TouchHistoryMath').default;
 
 const currentCentroidXOfTouchesChangedAfter =
@@ -31,9 +30,6 @@ const currentCentroidY = TouchHistoryMath.currentCentroidY;
  * single-touch gestures resilient to extra touches, and can be used to
  * recognize simple multi-touch gestures.
  *
- * By default, `PanResponder` holds an `InteractionManager` handle to block
- * long-running JS events from interrupting active gestures.
- *
  * It provides a predictable wrapper of the responder handlers provided by the
  * [gesture responder system](docs/gesture-responder-system.html).
  * For each handler, it provides a new `gestureState` object alongside the
@@ -405,9 +401,6 @@ const PanResponder = {
     getInteractionHandle: () => ?number,
     panHandlers: GestureResponderHandlerMethods,
   } {
-    const interactionState = {
-      handle: (null: ?number),
-    };
     const gestureState: PanResponderGestureState = {
       // Useful for debugging
       stateID: Math.random(),
@@ -464,10 +457,6 @@ const PanResponder = {
       },
 
       onResponderGrant(event: GestureResponderEvent): boolean {
-        if (!interactionState.handle) {
-          interactionState.handle =
-            InteractionManager.createInteractionHandle();
-        }
         gestureState.x0 = currentCentroidX(event.touchHistory);
         gestureState.y0 = currentCentroidY(event.touchHistory);
         gestureState.dx = 0;
@@ -482,21 +471,11 @@ const PanResponder = {
       },
 
       onResponderReject(event: GestureResponderEvent): void {
-        clearInteractionHandle(
-          interactionState,
-          config.onPanResponderReject,
-          event,
-          gestureState,
-        );
+        config.onPanResponderReject?.call(undefined, event, gestureState);
       },
 
       onResponderRelease(event: GestureResponderEvent): void {
-        clearInteractionHandle(
-          interactionState,
-          config.onPanResponderRelease,
-          event,
-          gestureState,
-        );
+        config.onPanResponderRelease?.call(undefined, event, gestureState);
         PanResponder._initializeGestureState(gestureState);
       },
 
@@ -529,21 +508,11 @@ const PanResponder = {
       onResponderEnd(event: GestureResponderEvent): void {
         const touchHistory = event.touchHistory;
         gestureState.numberActiveTouches = touchHistory.numberActiveTouches;
-        clearInteractionHandle(
-          interactionState,
-          config.onPanResponderEnd,
-          event,
-          gestureState,
-        );
+        config.onPanResponderEnd?.call(undefined, event, gestureState);
       },
 
       onResponderTerminate(event: GestureResponderEvent): void {
-        clearInteractionHandle(
-          interactionState,
-          config.onPanResponderTerminate,
-          event,
-          gestureState,
-        );
+        config.onPanResponderTerminate?.call(undefined, event, gestureState);
         PanResponder._initializeGestureState(gestureState);
       },
 
@@ -556,27 +525,13 @@ const PanResponder = {
     return {
       panHandlers,
       getInteractionHandle(): ?number {
-        return interactionState.handle;
+        // TODO: Deprecate and delete this method.
+        return null;
       },
     };
   },
 };
 
-function clearInteractionHandle(
-  interactionState: {handle: ?number, ...},
-  callback: ?(ActiveCallback | PassiveCallback),
-  event: GestureResponderEvent,
-  gestureState: PanResponderGestureState,
-) {
-  if (interactionState.handle) {
-    InteractionManager.clearInteractionHandle(interactionState.handle);
-    interactionState.handle = null;
-  }
-  if (callback) {
-    callback(event, gestureState);
-  }
-}
-
 export type PanResponderInstance = ReturnType<(typeof PanResponder)['create']>;
 
 export default PanResponder;

package/React/Base/RCTBridge.mm

@@ -380,6 +380,11 @@ static RCTBridge *RCTCurrentBridgeInstance = nil;
                   moduleProvider:(RCTBridgeModuleListProvider)block
                    launchOptions:(NSDictionary *)launchOptions
 {
+  // Only enabld this assertion in OSS
+#if COCOAPODS
+  [RCTBridge throwIfOnLegacyArch];
+#endif
+
   if (self = [super init]) {
     RCTEnforceNewArchitectureValidation(RCTNotAllowedInBridgeless, self, nil);
     _delegate = delegate;
@@ -393,6 +398,17 @@ static RCTBridge *RCTCurrentBridgeInstance = nil;
   return self;
 }
 
+// Wrap the exception throwing in a static method to avoid the warning: "The code following the exception will never be
+// executed". This might create build failures internally where we treat warnings as errors.
++ (void)throwIfOnLegacyArch
+{
+  @throw [NSException
+      exceptionWithName:NSInternalInconsistencyException
+                 reason:
+                     @"You are trying to initialize the legacy architecture. This is not supported anymore and will be removed in the next version of React Native. Please use the New Architecture instead."
+               userInfo:nil];
+}
+
 RCT_NOT_IMPLEMENTED(-(instancetype)init)
 
 - (void)dealloc

package/React/Base/RCTVersion.m

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

package/React/Fabric/Mounting/RCTComponentViewProtocol.h

@@ -111,6 +111,12 @@ typedef NS_OPTIONS(NSInteger, RNComponentViewUpdateMask) {
  */
 - (void)prepareForRecycle;
 
+/*
+ * Called for unmounted components that won't be moved to a recycle pool.
+ * Useful for releasing any associated resources.
+ */
+- (void)invalidate;
+
 /*
  * Read the last props used to update the view.
  */

package/React/Fabric/Mounting/RCTComponentViewRegistry.mm

@@ -108,6 +108,7 @@ const NSInteger RCTComponentViewRegistryRecyclePoolMaxSize = 1024;
   auto &recycledViews = _recyclePool[componentHandle];
 
   if (recycledViews.size() > RCTComponentViewRegistryRecyclePoolMaxSize || !componentViewDescriptor.shouldBeRecycled) {
+    [componentViewDescriptor.view invalidate];
     return;
   }
 

package/React/Fabric/Mounting/UIView+ComponentViewProtocol.h

@@ -37,6 +37,8 @@ NS_ASSUME_NONNULL_BEGIN
 
 - (void)prepareForRecycle;
 
+- (void)invalidate;
+
 - (facebook::react::Props::Shared)props;
 
 - (void)setIsJSResponder:(BOOL)isJSResponder;

package/React/Fabric/Mounting/UIView+ComponentViewProtocol.mm

@@ -129,6 +129,11 @@ using namespace facebook::react;
   // Default implementation does nothing.
 }
 
+- (void)invalidate
+{
+  // Default implementation does nothing.
+}
+
 - (facebook::react::Props::Shared)props
 {
   RCTAssert(NO, @"props access should be implemented by RCTViewComponentView.");

package/ReactAndroid/gradle.properties

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

package/ReactAndroid/src/main/java/com/facebook/react/ReactAndroidHWInputDeviceHelper.kt

@@ -33,26 +33,6 @@ internal class ReactAndroidHWInputDeviceHelper {
     }
   }
 
-  /** Called from [ReactRootView] when focused view changes. */
-  fun onFocusChanged(newFocusedView: View, context: ReactContext) {
-    if (lastFocusedViewId == newFocusedView.id) {
-      return
-    }
-    if (lastFocusedViewId != View.NO_ID) {
-      dispatchEvent(context, "blur", lastFocusedViewId)
-    }
-    lastFocusedViewId = newFocusedView.id
-    dispatchEvent(context, "focus", newFocusedView.id)
-  }
-
-  /** Called from [ReactRootView] when the whole view hierarchy looses focus. */
-  fun clearFocus(context: ReactContext) {
-    if (lastFocusedViewId != View.NO_ID) {
-      dispatchEvent(context, "blur", lastFocusedViewId)
-    }
-    lastFocusedViewId = View.NO_ID
-  }
-
   private fun dispatchEvent(
       context: ReactContext,
       eventType: String?,

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

@@ -341,39 +341,6 @@ public class ReactRootView extends FrameLayout implements RootView, ReactRoot {
     return super.dispatchKeyEvent(ev);
   }
 
-  @Override
-  protected void onFocusChanged(boolean gainFocus, int direction, Rect previouslyFocusedRect) {
-    if (!hasActiveReactContext() || !isViewAttachedToReactInstance()) {
-      FLog.w(
-          TAG,
-          "Unable to handle focus changed event as the catalyst instance has not been attached");
-      super.onFocusChanged(gainFocus, direction, previouslyFocusedRect);
-      return;
-    }
-    ReactContext context = getCurrentReactContext();
-    if (context != null) {
-      mAndroidHWInputDeviceHelper.clearFocus(context);
-    }
-    super.onFocusChanged(gainFocus, direction, previouslyFocusedRect);
-  }
-
-  @Override
-  public void requestChildFocus(View child, View focused) {
-    if (!hasActiveReactContext() || !isViewAttachedToReactInstance()) {
-      FLog.w(
-          TAG,
-          "Unable to handle child focus changed event as the catalyst instance has not been"
-              + " attached");
-      super.requestChildFocus(child, focused);
-      return;
-    }
-    ReactContext context = getCurrentReactContext();
-    if (context != null) {
-      mAndroidHWInputDeviceHelper.onFocusChanged(focused, context);
-    }
-    super.requestChildFocus(child, focused);
-  }
-
   protected void dispatchJSPointerEvent(MotionEvent event, boolean isCapture) {
     if (!hasActiveReactContext() || !isViewAttachedToReactInstance()) {
       FLog.w(TAG, "Unable to dispatch touch to JS as the catalyst instance has not been attached");

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

@@ -192,26 +192,6 @@ public class ReactAndroidHWInputDeviceHelper {
     );
   }
 
-  /** 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, context);
-    }
-    mLastFocusedViewId = newFocusedView.getId();
-    dispatchEvent("focus", newFocusedView.getId(), context);
-  }
-
-  /** 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, context);
-    }
-    mLastFocusedViewId = View.NO_ID;
-  }
-
   private void dispatchEvent(String eventType, int targetViewId, ReactContext context) {
     dispatchEvent(eventType, targetViewId, -1, context);
   }

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 82,
-    "patch" to 0,
-    "prerelease" to "0rc4"
+    "patch" to 1,
+    "prerelease" to "0"
   )
 }

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

@@ -560,15 +560,6 @@ public class ReactModalHostView(context: ThemedReactContext) :
       updateState(viewWidth, viewHeight)
     }
 
-    protected override fun onFocusChanged(
-      gainFocus: Boolean,
-      direction: Int,
-      previouslyFocusedRect: Rect?
-    ) {
-      androidHWInputDeviceHelper.clearFocus(reactContext)
-      super.onFocusChanged(gainFocus, direction, previouslyFocusedRect)
-    }
-
     /*
     public override fun requestChildFocus(child: View?, focused: View?) {
       androidHWInputDeviceHelper.onFocusChanged(focused, reactContext)

package/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactEditText.kt

@@ -425,7 +425,7 @@ public open class ReactEditText public constructor(context: Context) : AppCompat
   // that. This method will eventually replace requestFocusInternal()
   private fun requestFocusProgrammatically(): Boolean {
     val focused = super.requestFocus(FOCUS_DOWN, null)
-    if (isInTouchMode && showSoftInputOnFocus) {
+    if (showSoftInputOnFocus) {
       showSoftKeyboard()
     } else {
       if (isKeyboardOpened) {

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
@@ -747,6 +745,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()
@@ -869,7 +879,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)
@@ -1361,29 +1371,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")
@@ -117,7 +108,7 @@ public open class ReactViewManager : ReactClippingViewManager<ReactViewGroup>()
       view.isFocusable = false
       view.descendantFocusability = ViewGroup.FOCUS_BLOCK_DESCENDANTS
     } else {
-      view.descendantFocusability = ViewGroup.FOCUS_BEFORE_DESCENDANTS
+      view.descendantFocusability = ViewGroup.FOCUS_AFTER_DESCENDANTS
     }
   }
 
@@ -416,8 +407,15 @@ public open class ReactViewManager : ReactClippingViewManager<ReactViewGroup>()
     } else {
       view.setOnClickListener(null)
       view.isClickable = false
-      // Don't set view.setFocusable(false) because we might still want it to be focusable for
-      // accessibility reasons
+      view.isFocusable = false
+    }
+    // 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
     }
   }
 

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,15 +14,15 @@
 
 #define REACT_NATIVE_VERSION_MAJOR 0
 #define REACT_NATIVE_VERSION_MINOR 82
-#define REACT_NATIVE_VERSION_PATCH 0
+#define REACT_NATIVE_VERSION_PATCH 1
 
 namespace facebook::react {
 
 constexpr struct {
   int32_t Major = 0;
   int32_t Minor = 82;
-  int32_t Patch = 0;
-  std::string_view Prerelease = "0rc4";
+  int32_t Patch = 1;
+  std::string_view Prerelease = "0";
 } ReactNativeVersion;
 
 } // namespace facebook::react

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 &&