react-native-tvos 0.73.1-3 → 0.73.4-0

package/Libraries/Lists/VirtualizedListContext.js

@@ -10,9 +10,9 @@
 
 'use strict';
 
-import {typeof VirtualizedListContextResetter as VirtualizedListContextResetterType} from '@react-native/virtualized-lists';
+import {typeof VirtualizedListContextResetter as VirtualizedListContextResetterType} from '@react-native-tvos/virtualized-lists';
 
 const VirtualizedListContextResetter: VirtualizedListContextResetterType =
-  require('@react-native/virtualized-lists').VirtualizedListContextResetter;
+  require('@react-native-tvos/virtualized-lists').VirtualizedListContextResetter;
 
 module.exports = {VirtualizedListContextResetter};

package/Libraries/Lists/VirtualizedSectionList.js

@@ -10,13 +10,13 @@
 
 'use strict';
 
-import {typeof VirtualizedSectionList as VirtualizedSectionListType} from '@react-native/virtualized-lists';
+import {typeof VirtualizedSectionList as VirtualizedSectionListType} from '@react-native-tvos/virtualized-lists';
 
 const VirtualizedSectionList: VirtualizedSectionListType =
-  require('@react-native/virtualized-lists').VirtualizedSectionList;
+  require('@react-native-tvos/virtualized-lists').VirtualizedSectionList;
 
 export type {
   SectionBase,
   ScrollToLocationParamsType,
-} from '@react-native/virtualized-lists';
+} from '@react-native-tvos/virtualized-lists';
 module.exports = VirtualizedSectionList;

package/Libraries/Modal/Modal.js

@@ -17,7 +17,7 @@ import {type EventSubscription} from '../vendor/emitter/EventEmitter';
 import ModalInjection from './ModalInjection';
 import NativeModalManager from './NativeModalManager';
 import RCTModalHostView from './RCTModalHostViewNativeComponent';
-import {VirtualizedListContextResetter} from '@react-native/virtualized-lists';
+import {VirtualizedListContextResetter} from '@react-native-tvos/virtualized-lists';
 
 const ScrollView = require('../Components/ScrollView/ScrollView');
 const View = require('../Components/View/View');

package/Libraries/Utilities/ReactNativeTestTools.js

@@ -16,7 +16,7 @@ const Switch = require('../Components/Switch/Switch').default;
 const TextInput = require('../Components/TextInput/TextInput');
 const View = require('../Components/View/View');
 const Text = require('../Text/Text');
-const {VirtualizedList} = require('@react-native/virtualized-lists');
+const {VirtualizedList} = require('@react-native-tvos/virtualized-lists');
 const React = require('react');
 const ShallowRenderer = require('react-shallow-renderer');
 const ReactTestRenderer = require('react-test-renderer');

package/Libraries/promiseRejectionTrackingOptions.js

@@ -34,6 +34,11 @@ let rejectionTrackingOptions: $NonMaybeType<Parameters<enable>[0]> = {
             ? rejection
             : JSON.stringify((rejection: $FlowFixMe));
       }
+      // It could although this object is not a standard error, it still has stack information to unwind
+      // $FlowFixMe ignore types just check if stack is there
+      if (rejection.stack && typeof rejection.stack === 'string') {
+        stack = rejection.stack;
+      }
     }
 
     const warning = `Possible unhandled promise rejection (id: ${id}):\n${

package/README.md

@@ -74,21 +74,22 @@ See [this document](https://docs.expo.dev/bare/using-expo-cli/) for more details
 
 ## _(New)_ Using the Expo SDK with TV apps
 
-Starting with the Expo SDK 50 preview, and react-native-tvos 0.73.x, it will be possible to create Expo apps, and build them for TV via a new config plugin.
+See the [Building Expo apps for TV](https://docs.expo.dev/guides/building-for-tv/) guide from Expo for details, including supported Expo modules and limitations.
 
-This functionality will be new in Expo SDK 50, and will be considered an experimental feature for now.
+Expo SDK 50 or greater, and react-native-tvos 0.73.x or later, are required.
 
-The fastest way to generate a new project is described in the [TV Example](https://github.com/expo/examples/tree/master/with-tv) in the Expo examples repo.
+## _(New)_ How to support TV specific file extensions
 
-Besides most of the core Expo modules, these also work on TV:
+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)
 
-- expo-av
-- expo-image
-- expo-localization
-- expo-updates
+When this is enabled, Metro will resolve files in the following order of preference (and similarly for the other supported file extensions):
 
-TV does NOT support dev client (dev menu, dev launcher) at this time.
-TV does NOT support Expo Router at this time.
+- `file.ios.tv.tsx` or `file.android.tv.tsx`
+- `file.tv.tsx`
+- `file.ios.tsx` or `file.android.tsx`
+- `file.tsx`
+
+This config is not enabled by default, since it will impact bundling performance, but is available for developers who need this capability.
 
 ## Code changes
 

package/React/Base/RCTVersion.m

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

package/React/CoreModules/RCTDeviceInfo.mm

@@ -80,11 +80,44 @@ RCT_EXPORT_MODULE()
                                              object:nil];
 
 #endif
+
+  // TODO T175901725 - Registering the RCTDeviceInfo module to the notification is a short-term fix to unblock 0.73
+  // The actual behavior should be that the module is properly registered in the TurboModule/Bridge infrastructure
+  // and the infrastructure imperatively invoke the `invalidate` method, rather than listening to a notification.
+  // This is a temporary workaround until we can investigate the issue better as there might be other modules in a
+  // similar situation.
+  [[NSNotificationCenter defaultCenter] addObserver:self
+                                           selector:@selector(invalidate)
+                                               name:RCTBridgeWillInvalidateModulesNotification
+                                             object:nil];
 }
 
 - (void)invalidate
 {
   _invalidated = YES;
+  [self _cleanupObservers];
+}
+
+- (void)_cleanupObservers
+{
+  [[NSNotificationCenter defaultCenter] removeObserver:self
+                                                  name:RCTAccessibilityManagerDidUpdateMultiplierNotification
+                                                object:[_moduleRegistry moduleForName:"AccessibilityManager"]];
+#if !TARGET_OS_TV
+  [[NSNotificationCenter defaultCenter] removeObserver:self
+                                                  name:UIApplicationDidChangeStatusBarOrientationNotification
+                                                object:nil];
+#endif
+  [[NSNotificationCenter defaultCenter] removeObserver:self name:UIApplicationDidBecomeActiveNotification object:nil];
+
+  [[NSNotificationCenter defaultCenter] removeObserver:self name:RCTUserInterfaceStyleDidChangeNotification object:nil];
+
+  [[NSNotificationCenter defaultCenter] removeObserver:self name:RCTWindowFrameDidChangeNotification object:nil];
+
+  [[NSNotificationCenter defaultCenter] addObserver:self
+                                           selector:@selector(invalidate)
+                                               name:RCTBridgeWillInvalidateModulesNotification
+                                             object:nil];
 }
 
 static BOOL RCTIsIPhoneNotched()

package/React/CoreModules/RCTRedBox.mm

@@ -302,6 +302,23 @@ RCT_NOT_IMPLEMENTED(-(instancetype)initWithCoder : (NSCoder *)aDecoder)
   return lineInfo;
 }
 
+- (void)tableView:(UITableView *)tableView didUpdateFocusInContext:(UITableViewFocusUpdateContext *)context withAnimationCoordinator:(UIFocusAnimationCoordinator *)coordinator
+{
+    UITableViewCell *previouslyFocusedItem = (UITableViewCell *)context.previouslyFocusedItem;
+    if ([previouslyFocusedItem isKindOfClass:[UITableViewCell class]]) {
+        [coordinator addCoordinatedUnfocusingAnimations:^(id<UIFocusAnimationContext>  _Nonnull animationContext) {
+            previouslyFocusedItem.textLabel.textColor = [UIColor whiteColor];
+        } completion:nil];
+    }
+
+    UITableViewCell *nextFocusedItem = (UITableViewCell *)context.nextFocusedItem;
+    if ([nextFocusedItem isKindOfClass:[UITableViewCell class]]) {
+        [coordinator addCoordinatedFocusingAnimations:^(id<UIFocusAnimationContext>  _Nonnull animationContext) {
+            nextFocusedItem.textLabel.textColor = [UIColor blackColor];
+        } completion:nil];
+    }
+}
+
 #pragma mark - TableView
 
 - (NSInteger)numberOfSectionsInTableView:(__unused UITableView *)tableView

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

@@ -51,7 +51,8 @@ using namespace facebook::react;
   BOOL _removeClippedSubviews;
   NSMutableArray<UIView *> *_reactSubviews;
   BOOL _motionEffectsAdded;
-    UITapGestureRecognizer *_selectRecognizer;
+  UITapGestureRecognizer *_selectRecognizer;
+  UILongPressGestureRecognizer * _longSelectRecognizer;
   NSSet<NSString *> *_Nullable _propKeysManagedByAnimated_DO_NOT_USE_THIS_IS_BROKEN;
   ParallaxProperties _tvParallaxProperties;
   BOOL _hasTVPreferredFocus;
@@ -249,6 +250,11 @@ using namespace facebook::react;
     [self sendNotificationWithEventType:@"select"];
 }
 
+- (void)sendLongSelectNotification:(UIGestureRecognizer *)recognizer
+{
+  [self sendNotificationWithEventType:@"longSelect"];
+}
+
 - (void)sendNotificationWithEventType:(NSString * __nonnull)eventType
 {
   [[NSNotificationCenter defaultCenter] postNotificationName:@"RCTTVNavigationEventNotification"
@@ -292,6 +298,13 @@ using namespace facebook::react;
   }
 }
 
+- (void)handleLongSelect:(UIGestureRecognizer *)r
+{
+  if (r.state == UIGestureRecognizerStateBegan) {
+    [self sendLongSelectNotification:r];
+  }
+}
+
 - (void)addParallaxMotionEffects
 {
   if(!_tvParallaxProperties.enabled) {
@@ -887,11 +900,21 @@ using namespace facebook::react;
                                                                                    action:@selector(handleSelect:)];
       recognizer.allowedPressTypes = @[ @(UIPressTypeSelect) ];
       _selectRecognizer = recognizer;
+
+      UILongPressGestureRecognizer *longRecognizer = [[UILongPressGestureRecognizer alloc] initWithTarget:self action:@selector(handleLongSelect:)];
+      recognizer.allowedPressTypes = @[ @(UIPressTypeSelect) ];
+      [self addGestureRecognizer:longRecognizer];
+      _longSelectRecognizer = longRecognizer;
+
       [self addGestureRecognizer:_selectRecognizer];
+      [self addGestureRecognizer:_longSelectRecognizer];
     } else {
       if (_selectRecognizer) {
         [self removeGestureRecognizer:_selectRecognizer];
       }
+      if (_longSelectRecognizer) {
+        [self removeGestureRecognizer:_longSelectRecognizer];
+      }
     }
   }
   // `tvParallaxProperties

package/React/Modules/RCTUIManager.m

@@ -179,14 +179,20 @@ RCT_EXPORT_MODULE()
       _componentDataByName[componentData.name] = componentData;
     }
   }
-
+  // Preload the a11yManager as the RCTUIManager needs it to listen for notification
+  // By eagerly preloading it in the setBridge method, we make sure that the manager is
+  // properly initialized in the Main Thread and that we do not incur in any race condition
+  // or concurrency problem.
+  id<RCTBridgeModule> a11yManager = [self->_bridge moduleForName:@"AccessibilityManager"
+                                           lazilyLoadIfNecessary:YES];
+  __weak NSObject * a11yManagerWeakObject = a11yManager;
   // This dispatch_async avoids a deadlock while configuring native modules
   dispatch_async(dispatch_get_main_queue(), ^{
+    __strong NSObject * a11yManagerStrongObject = a11yManagerWeakObject;
     [[NSNotificationCenter defaultCenter] addObserver:self
                                              selector:@selector(didReceiveNewContentSizeMultiplier)
                                                  name:@"RCTAccessibilityManagerDidUpdateMultiplierNotification"
-                                               object:[self->_bridge moduleForName:@"AccessibilityManager"
-                                                             lazilyLoadIfNecessary:YES]];
+                                               object:a11yManagerStrongObject];
   });
 #if !TARGET_OS_TV
   [[NSNotificationCenter defaultCenter] addObserver:self

package/React/Views/RCTTVView.m

@@ -22,6 +22,7 @@
 @implementation RCTTVView {
   __weak RCTBridge *_bridge;
   UITapGestureRecognizer *_selectRecognizer;
+  UILongPressGestureRecognizer * _longSelectRecognizer;
   BOOL motionEffectsAdded;
   NSArray* focusDestinations;
   id<UIFocusItem> previouslyFocusedItem;
@@ -79,11 +80,21 @@ RCT_NOT_IMPLEMENTED(-(instancetype)initWithCoder : unused)
                                                                                  action:@selector(handleSelect:)];
     recognizer.allowedPressTypes = @[ @(UIPressTypeSelect) ];
     _selectRecognizer = recognizer;
+
+    UILongPressGestureRecognizer *longRecognizer = [[UILongPressGestureRecognizer alloc] initWithTarget:self action:@selector(handleLongSelect:)];
+    recognizer.allowedPressTypes = @[ @(UIPressTypeSelect) ];
+    [self addGestureRecognizer:longRecognizer];
+    _longSelectRecognizer = longRecognizer;
+
     [self addGestureRecognizer:_selectRecognizer];
+    [self addGestureRecognizer:_longSelectRecognizer];
   } else {
     if (_selectRecognizer) {
       [self removeGestureRecognizer:_selectRecognizer];
     }
+    if (_longSelectRecognizer) {
+      [self removeGestureRecognizer:_longSelectRecognizer];
+    }
   }
 }
 
@@ -120,6 +131,13 @@ RCT_NOT_IMPLEMENTED(-(instancetype)initWithCoder : unused)
   }
 }
 
+- (void)handleLongSelect:(UIGestureRecognizer *)r
+{
+  if (r.state == UIGestureRecognizerStateBegan) {
+    [self sendLongSelectNotification:r];
+  }
+}
+
 - (BOOL)isUserInteractionEnabled
 {
   return YES;
@@ -414,6 +432,11 @@ RCT_NOT_IMPLEMENTED(-(instancetype)initWithCoder : unused)
     [self sendNotificationWithEventType:@"select"];
 }
 
+- (void)sendLongSelectNotification:(UIGestureRecognizer *)recognizer
+{
+    [self sendNotificationWithEventType:@"longSelect"];
+}
+
 - (void)sendNotificationWithEventType:(NSString * __nonnull)eventType
 {
   [[NSNotificationCenter defaultCenter] postNotificationName:@"RCTTVNavigationEventNotification"

package/React/Views/ScrollView/RCTScrollView.m

@@ -288,6 +288,7 @@
   NSString *_lastEmittedEventName;
   NSHashTable *_scrollListeners;
   NSMutableDictionary *_tvRemoteGestureRecognizers;
+  BOOL _blockFirstTouch;
 }
 
 - (void)_registerKeyboardListener
@@ -614,6 +615,10 @@ static inline void RCTApplyTransformationAccordingLayoutDirection(
 
 - (void)scrollToOffset:(CGPoint)offset animated:(BOOL)animated
 {
+  if ([self reactLayoutDirection] == UIUserInterfaceLayoutDirectionRightToLeft) {
+    offset.x = _scrollView.contentSize.width - _scrollView.frame.size.width - offset.x;
+  }
+
   if (!CGPointEqualToPoint(_scrollView.contentOffset, offset)) {
     CGRect maxRect = CGRectMake(
         fmin(-_scrollView.contentInset.left, 0),
@@ -985,7 +990,11 @@ RCT_SCROLL_EVENT_HANDLER(scrollViewDidScrollToTop, onScrollToTop)
         [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];
@@ -1005,6 +1014,76 @@ RCT_SCROLL_EVENT_HANDLER(scrollViewDidScrollToTop, onScrollToTop)
     }
 }
 
+- (void) addArrowsListeners {
+    [[NSNotificationCenter defaultCenter] addObserver:self
+                                             selector:@selector(handleTVNavigationEventNotification:)
+                                                 name:@"RCTTVNavigationEventNotification"
+                                               object:nil];
+}
+
+- (void) removeArrowsListeners {
+    [[NSNotificationCenter defaultCenter] removeObserver:self
+                                                    name:@"RCTTVNavigationEventNotification"
+                                                  object:nil];
+}
+
+
+- (void)handleTVNavigationEventNotification:(NSNotification *)notif
+{
+    NSArray *supportedEvents = [NSArray arrayWithObjects:@"up", @"down", @"left", @"right", nil];
+
+    if (notif.object == nil || notif.object[@"eventType"] == nil || ![supportedEvents containsObject:notif.object[@"eventType"]] ) {
+        return;
+    }
+    
+    if (_blockFirstTouch) {
+        _blockFirstTouch = NO;
+        return;
+    }
+
+    if (![self isHorizontal:self.scrollView]) {
+        if ([notif.object[@"eventType"]  isEqual: @"down"]) {
+            [self swipedDown];
+            return;
+        }
+        
+        if ([notif.object[@"eventType"]  isEqual: @"up"]) {
+            [self swipedUp];
+            return;
+        }
+    }
+  
+    if ([notif.object[@"eventType"]  isEqual: @"left"]) {
+        [self swipedLeft];
+        return;
+    }
+    
+    if ([notif.object[@"eventType"]  isEqual: @"right"]) {
+        [self swipedRight];
+        return;
+    }
+}
+
+- (BOOL)shouldUpdateFocusInContext:(UIFocusUpdateContext *)context
+{
+    // Keep focus inside the scroll view till the end of the content
+    if ([self isHorizontal:self.scrollView]) {
+        if ((context.focusHeading == UIFocusHeadingLeft && self.scrollView.contentOffset.x > 0)
+            || (context.focusHeading == UIFocusHeadingRight && self.scrollView.contentOffset.x < self.scrollView.contentSize.width - self.scrollView.visibleSize.width)
+        ) {
+            return [UIFocusSystem environment:self containsEnvironment:context.nextFocusedItem];
+        }
+    } else {
+        if ((context.focusHeading == UIFocusHeadingUp && self.scrollView.contentOffset.y > 0)
+            || (context.focusHeading == UIFocusHeadingDown && self.scrollView.contentOffset.y < self.scrollView.contentSize.height - self.scrollView.visibleSize.height)
+        ) {
+            return [UIFocusSystem environment:self containsEnvironment:context.nextFocusedItem];
+        }
+    }
+
+    return [super shouldUpdateFocusInContext:context];
+}
+
 - (void)sendFocusNotification
 {
   [[NSNotificationCenter defaultCenter] postNotificationName:@"RCTTVNavigationEventNotification"
@@ -1044,6 +1123,7 @@ RCT_SCROLL_EVENT_HANDLER(scrollViewDidScrollToTop, onScrollToTop)
 
 - (void)swipeVerticalScrollToOffset:(CGFloat)yOffset
 {
+    _blockFirstTouch = NO;
     dispatch_async(dispatch_get_main_queue(), ^{
         CGFloat limitedOffset = yOffset;
         limitedOffset = MAX(limitedOffset, 0.0);
@@ -1057,6 +1137,7 @@ RCT_SCROLL_EVENT_HANDLER(scrollViewDidScrollToTop, onScrollToTop)
 
 - (void)swipeHorizontalScrollToOffset:(CGFloat)xOffset
 {
+    _blockFirstTouch = NO;
     dispatch_async(dispatch_get_main_queue(), ^{
         CGFloat limitedOffset = xOffset;
         limitedOffset = MAX(limitedOffset, 0.0);

package/ReactAndroid/build.gradle

@@ -263,7 +263,7 @@ task createNativeDepsDirectories {
 }
 
 task downloadBoost(dependsOn: createNativeDepsDirectories, type: Download) {
-    src("https://boostorg.jfrog.io/artifactory/main/release/${BOOST_VERSION.replace("_", ".")}/source/boost_${BOOST_VERSION}.tar.gz")
+    src("https://archives.boost.io/release/${BOOST_VERSION.replace("_", ".")}/source/boost_${BOOST_VERSION}.tar.gz")
     onlyIfModified(true)
     overwrite(false)
     retries(5)

package/ReactAndroid/gradle.properties

@@ -1,4 +1,4 @@
-VERSION_NAME=0.73.1-3
+VERSION_NAME=0.73.4-0
 
 # react.internal.publishingGroup=com.facebook.react
 # For TV use this group

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

@@ -113,6 +113,7 @@ public abstract class ReactActivity extends AppCompatActivity
   @Override
   public void onRequestPermissionsResult(
       int requestCode, String[] permissions, int[] grantResults) {
+    super.onRequestPermissionsResult(requestCode, permissions, grantResults);
     mDelegate.onRequestPermissionsResult(requestCode, permissions, grantResults);
   }
 

package/ReactAndroid/src/main/java/com/facebook/react/bridge/queue/MessageQueueThreadHandler.java

@@ -10,6 +10,8 @@ package com.facebook.react.bridge.queue;
 import android.os.Handler;
 import android.os.Looper;
 import android.os.Message;
+import com.facebook.common.logging.FLog;
+import com.facebook.react.common.ReactConstants;
 
 /** Handler that can catch and dispatch Exceptions to an Exception handler. */
 public class MessageQueueThreadHandler extends Handler {
@@ -26,6 +28,15 @@ public class MessageQueueThreadHandler extends Handler {
     try {
       super.dispatchMessage(msg);
     } catch (Exception e) {
+      if (e instanceof NullPointerException) {
+        FLog.e(
+            ReactConstants.TAG,
+            "Caught NullPointerException when dispatching message in MessageQueueThreadHandler. This is likely caused by runnable"
+                + "(msg.callback) being nulled in Android Handler after dispatching and before handling (see T170239922 for more details)."
+                + "Currently we observe that it only happen once which is during initialisation. Due to fixing probably involve Android "
+                + "System code, we decide to ignore here for now and print an error message for debugging purpose in case this cause more serious issues in future.");
+        return;
+      }
       mExceptionHandler.handleException(e);
     }
   }

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

package/ReactAndroid/src/main/java/com/facebook/react/uimanager/UIManagerModuleConstantsHelper.java

@@ -206,7 +206,15 @@ import java.util.Set;
     }
     for (String oldKey : keysToNormalize) {
       Object value = events.get(oldKey);
-      String newKey = "top" + oldKey.substring(0, 1).toUpperCase() + oldKey.substring(1);
+      String baseKey = "";
+      if (oldKey.startsWith("on")) {
+        // Drop "on" prefix.
+        baseKey = oldKey.substring(2);
+      } else {
+        // Capitalize first letter.
+        baseKey = oldKey.substring(0, 1).toUpperCase() + oldKey.substring(1);
+      }
+      String newKey = "top" + baseKey;
       events.put(newKey, value);
     }
   }

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

@@ -10,6 +10,8 @@ package com.facebook.react.views.textinput;
 import static com.facebook.react.uimanager.UIManagerHelper.getReactContext;
 
 import android.app.UiModeManager;
+import android.content.ClipData;
+import android.content.ClipboardManager;
 import android.content.Context;
 import android.content.res.Configuration;
 import android.graphics.Color;
@@ -212,7 +214,9 @@ public class ReactEditText extends AppCompatEditText {
           public void onDestroyActionMode(ActionMode mode) {}
         };
     setCustomSelectionActionModeCallback(customActionModeCallback);
-    setCustomInsertionActionModeCallback(customActionModeCallback);
+    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+      setCustomInsertionActionModeCallback(customActionModeCallback);
+    }
   }
 
   @Override
@@ -329,7 +333,26 @@ public class ReactEditText extends AppCompatEditText {
   @Override
   public boolean onTextContextMenuItem(int id) {
     if (id == android.R.id.paste) {
-      id = android.R.id.pasteAsPlainText;
+      if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+        id = android.R.id.pasteAsPlainText;
+      } else {
+        ClipboardManager clipboard =
+            (ClipboardManager) getContext().getSystemService(Context.CLIPBOARD_SERVICE);
+        ClipData previousClipData = clipboard.getPrimaryClip();
+        if (previousClipData != null) {
+          for (int i = 0; i < previousClipData.getItemCount(); i++) {
+            final CharSequence text = previousClipData.getItemAt(i).coerceToText(getContext());
+            final CharSequence paste = (text instanceof Spanned) ? text.toString() : text;
+            if (paste != null) {
+              ClipData clipData = ClipData.newPlainText(null, text);
+              clipboard.setPrimaryClip(clipData);
+            }
+          }
+          boolean actionPerformed = super.onTextContextMenuItem(id);
+          clipboard.setPrimaryClip(previousClipData);
+          return actionPerformed;
+        }
+      }
     }
     return super.onTextContextMenuItem(id);
   }
@@ -715,8 +738,10 @@ public class ReactEditText extends AppCompatEditText {
     }
     mDisableTextDiffing = false;
 
-    if (getBreakStrategy() != reactTextUpdate.getTextBreakStrategy()) {
-      setBreakStrategy(reactTextUpdate.getTextBreakStrategy());
+    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+      if (getBreakStrategy() != reactTextUpdate.getTextBreakStrategy()) {
+        setBreakStrategy(reactTextUpdate.getTextBreakStrategy());
+      }
     }
 
     // Update cached spans (in Fabric only).

package/ReactCommon/cxxreact/ReactNativeVersion.h

@@ -17,8 +17,8 @@ namespace facebook::react {
 constexpr struct {
   int32_t Major = 0;
   int32_t Minor = 73;
-  int32_t Patch = 1;
-  std::string_view Prerelease = "3";
+  int32_t Patch = 4;
+  std::string_view Prerelease = "0";
 } ReactNativeVersion;
 
 } // namespace facebook::react

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

@@ -991,7 +991,7 @@ void YogaLayoutableShadowNode::ensureConsistency() const {
 }
 
 void YogaLayoutableShadowNode::ensureYogaChildrenLookFine() const {
-#ifdef REACT_NATIVE_DEBUG
+#if defined(REACT_NATIVE_DEBUG) && defined(WITH_FBSYSTRACE)
   // Checking that the shapes of Yoga node children object look fine.
   // This is the only heuristic that might produce false-positive results
   // (really broken dangled nodes might look fine). This is useful as an early
@@ -1009,7 +1009,7 @@ void YogaLayoutableShadowNode::ensureYogaChildrenLookFine() const {
 }
 
 void YogaLayoutableShadowNode::ensureYogaChildrenAlignment() const {
-#ifdef REACT_NATIVE_DEBUG
+#if defined(REACT_NATIVE_DEBUG) && defined(WITH_FBSYSTRACE)
   // If the node is not a leaf node, checking that:
   // - All children are `YogaLayoutableShadowNode` subclasses.
   // - All Yoga children are owned/connected to corresponding children of

package/ReactCommon/react/renderer/core/EventEmitter.cpp

@@ -16,18 +16,26 @@
 
 namespace facebook::react {
 
+static bool hasPrefix(const std::string& str, const std::string& prefix) {
+  return str.compare(0, prefix.length(), prefix) == 0;
+}
+
 // TODO(T29874519): Get rid of "top" prefix once and for all.
 /*
- * Capitalizes the first letter of the event type and adds "top" prefix if
- * necessary (e.g. "layout" becames "topLayout").
+ * Replaces "on" with "top" if present. Or capitalizes the first letter and adds
+ * "top" prefix. E.g. "eventName" becomes "topEventName", "onEventName" also
+ * becomes "topEventName".
  */
 static std::string normalizeEventType(std::string type) {
   auto prefixedType = std::move(type);
-  if (prefixedType.find("top", 0) != 0) {
-    prefixedType.insert(0, "top");
-    prefixedType[3] = static_cast<char>(toupper(prefixedType[3]));
+  if (facebook::react::hasPrefix(prefixedType, "top")) {
+    return prefixedType;
+  }
+  if (facebook::react::hasPrefix(prefixedType, "on")) {
+    return "top" + prefixedType.substr(2);
   }
-  return prefixedType;
+  prefixedType[0] = static_cast<char>(toupper(prefixedType[0]));
+  return "top" + prefixedType;
 }
 
 std::mutex& EventEmitter::DispatchMutex() {