react-native-tvos 0.86.0-2 → 0.87.0-0

package/React/Fabric/Mounting/ComponentViews/Text/RCTParagraphComponentView.mm

@@ -9,6 +9,7 @@
 #import "RCTParagraphComponentAccessibilityProvider.h"
 
 #import <MobileCoreServices/UTCoreTypes.h>
+#import <react/featureflags/ReactNativeFeatureFlags.h>
 #import <react/renderer/components/text/ParagraphComponentDescriptor.h>
 #import <react/renderer/components/text/ParagraphProps.h>
 #import <react/renderer/components/text/ParagraphState.h>
@@ -24,6 +25,15 @@
 
 using namespace facebook::react;
 
+@interface RCTTextLayoutManager (RCTParagraphComponentViewPrivate)
+
+- (CGRect)drawingFrameForAttributedString:(facebook::react::AttributedString)attributedString
+                      paragraphAttributes:(facebook::react::ParagraphAttributes)paragraphAttributes
+                                    frame:(CGRect)frame
+                           containerFrame:(CGRect *)containerFrame;
+
+@end
+
 // ParagraphTextView is an auxiliary view we set as contentView so the drawing
 // can happen on top of the layers manipulated by RCTViewComponentView (the parent view)
 @interface RCTParagraphTextView : UIView
@@ -31,6 +41,7 @@ using namespace facebook::react;
 @property (nonatomic) ParagraphShadowNode::ConcreteState::Shared state;
 @property (nonatomic) ParagraphAttributes paragraphAttributes;
 @property (nonatomic) LayoutMetrics layoutMetrics;
+@property (nonatomic) CGRect drawingFrame;
 
 @end
 
@@ -50,6 +61,7 @@ using namespace facebook::react;
   RCTParagraphComponentAccessibilityProvider *_accessibilityProvider;
   UILongPressGestureRecognizer *_longPressGestureRecognizer;
   RCTParagraphTextView *_textView;
+  CGRect _textLayoutFrame;
 }
 
 - (instancetype)initWithFrame:(CGRect)frame
@@ -60,6 +72,7 @@ using namespace facebook::react;
     self.opaque = NO;
     _textView = [RCTParagraphTextView new];
     _textView.backgroundColor = UIColor.clearColor;
+    _textView.drawingFrame = self.bounds;
     self.contentView = _textView;
   }
 
@@ -134,6 +147,7 @@ using namespace facebook::react;
   // re-applying individual sub-values which weren't changed.
   [super updateLayoutMetrics:layoutMetrics oldLayoutMetrics:_layoutMetrics];
   _textView.layoutMetrics = _layoutMetrics;
+  _textLayoutFrame = RCTCGRectFromRect(_layoutMetrics.getContentFrame());
   [_textView setNeedsDisplay];
   [self setNeedsLayout];
 }
@@ -149,7 +163,28 @@ using namespace facebook::react;
 {
   [super layoutSubviews];
 
-  _textView.frame = self.bounds;
+  CGRect textViewFrame = self.bounds;
+  CGRect drawingFrame = RCTCGRectFromRect(_layoutMetrics.getContentFrame());
+
+  if (ReactNativeFeatureFlags::enableIOSCompressedTextFrameAdjustment() && _textView.state &&
+      drawingFrame.size.height > 0) {
+    const auto &stateData = _textView.state->getData();
+    auto textLayoutManager = stateData.layoutManager.lock();
+    if (textLayoutManager) {
+      RCTTextLayoutManager *nativeTextLayoutManager =
+          (RCTTextLayoutManager *)unwrapManagedObject(textLayoutManager->getNativeTextLayoutManager());
+      CGRect drawingContainerFrame = drawingFrame;
+      drawingFrame = [nativeTextLayoutManager drawingFrameForAttributedString:stateData.attributedString
+                                                          paragraphAttributes:_paragraphAttributes
+                                                                        frame:drawingFrame
+                                                               containerFrame:&drawingContainerFrame];
+      textViewFrame = CGRectUnion(textViewFrame, drawingContainerFrame);
+    }
+  }
+
+  _textLayoutFrame = drawingFrame;
+  _textView.frame = textViewFrame;
+  _textView.drawingFrame = CGRectOffset(drawingFrame, -textViewFrame.origin.x, -textViewFrame.origin.y);
 }
 
 #pragma mark - Accessibility
@@ -194,7 +229,7 @@ using namespace facebook::react;
     if (textLayoutManager) {
       RCTTextLayoutManager *nativeTextLayoutManager =
           (RCTTextLayoutManager *)unwrapManagedObject(textLayoutManager->getNativeTextLayoutManager());
-      CGRect frame = RCTCGRectFromRect(_layoutMetrics.getContentFrame());
+      CGRect frame = _textLayoutFrame;
       _accessibilityProvider =
           [[RCTParagraphComponentAccessibilityProvider alloc] initWithString:data.attributedString
                                                                layoutManager:nativeTextLayoutManager
@@ -268,7 +303,7 @@ using namespace facebook::react;
 
   RCTTextLayoutManager *nativeTextLayoutManager =
       (RCTTextLayoutManager *)unwrapManagedObject(textLayoutManager->getNativeTextLayoutManager());
-  CGRect frame = RCTCGRectFromRect(_layoutMetrics.getContentFrame());
+  CGRect frame = _textLayoutFrame;
 
   auto eventEmitter = [nativeTextLayoutManager getEventEmitterWithAttributeString:stateData.attributedString
                                                               paragraphAttributes:_paragraphAttributes
@@ -412,7 +447,7 @@ Class<RCTComponentViewProtocol> RCTParagraphCls(void)
   RCTTextLayoutManager *nativeTextLayoutManager =
       (RCTTextLayoutManager *)unwrapManagedObject(textLayoutManager->getNativeTextLayoutManager());
 
-  CGRect frame = RCTCGRectFromRect(_layoutMetrics.getContentFrame());
+  CGRect frame = _drawingFrame;
 
   [nativeTextLayoutManager drawAttributedString:stateData.attributedString
                             paragraphAttributes:_paragraphAttributes

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

@@ -433,9 +433,7 @@ static BOOL RCTLayerTransformCollapsesAxis(CALayer *layer)
   float magnification = _tvParallaxProperties.magnification;
 
   if (magnification != 1.0) {
-    [UIView animateWithDuration:0.2 animations:^{
       self.transform = CGAffineTransformScale(self.transform, magnification, magnification);
-    }];
   }
 
   _motionEffectsAdded = YES;
@@ -447,13 +445,11 @@ static BOOL RCTLayerTransformCollapsesAxis(CALayer *layer)
     return;
   }
 
-  [UIView animateWithDuration:0.2 animations:^{
-    float magnification = self->_tvParallaxProperties.magnification;
-    BOOL enabled = self->_tvParallaxProperties.enabled;
-    if (enabled && magnification != 0.0 && magnification != 1.0) {
-      self.transform = CGAffineTransformScale(self.transform, 1.0/magnification, 1.0/magnification);
-    }
-  }];
+  float magnification = self->_tvParallaxProperties.magnification;
+  BOOL enabled = self->_tvParallaxProperties.enabled;
+  if (enabled && magnification != 0.0 && magnification != 1.0) {
+    self.transform = CGAffineTransformScale(self.transform, 1.0/magnification, 1.0/magnification);
+  }
 
   for (UIMotionEffect *effect in [self.motionEffects copy]){
     [self removeMotionEffect:effect];
@@ -606,12 +602,12 @@ static BOOL RCTLayerTransformCollapsesAxis(CALayer *layer)
 
 - (void)didUpdateFocusInContext:(UIFocusUpdateContext *)context withAnimationCoordinator:(UIFocusAnimationCoordinator *)coordinator
 {
-    if (context.previouslyFocusedView == context.nextFocusedView) {
+    if (context.previouslyFocusedItem == context.nextFocusedItem) {
       return;
     }
   
     if (_autoFocus && self.focusGuide != nil && context.previouslyFocusedItem != nil) {
-      // Whenever focus leaves the container, `nextFocusedView` is the destination, the item outside the container.
+      // Whenever focus leaves the container, `nextFocusedItem` is the destination, the item outside the container.
       // So, `previouslyFocusedItem` is always the last focused child of `TVFocusGuide`.
       // We should update `preferredFocusEnvironments` in this case to make sure `FocusGuide` remembers
       // the last focused element and redirects the focus to it whenever focus comes back.
@@ -619,20 +615,20 @@ static BOOL RCTLayerTransformCollapsesAxis(CALayer *layer)
       [self handleFocusGuide];
     }
 
-    if (context.nextFocusedView == self) {
+    if (context.nextFocusedItem == self) {
       [self becomeFirstResponder];
       [self enableDirectionalFocusGuides];
-      [coordinator addCoordinatedAnimations:^(void){
-          if (self->_eventEmitter) self->_eventEmitter->onFocus();
+      if (self->_eventEmitter) self->_eventEmitter->onFocus();
+      [coordinator addCoordinatedFocusingAnimations:^(id<UIFocusAnimationContext>  _Nonnull animationContext) {
           [self addParallaxMotionEffects];
       } completion:^(void){}];
       // Without this check, onBlur would also trigger when `TVFocusGuideView` transfers focus to its children.
       // [self isTVFocusGuide] is false when autofocus and destinations are not used, so we cannot use that.
       // Generally speaking, it would happen for any non-collapsable `View`.
-    } else if (context.previouslyFocusedView == self) {
-      [coordinator addCoordinatedAnimations:^(void){
+    } else if (context.previouslyFocusedItem == self) {
+      if (self->_eventEmitter) self->_eventEmitter->onBlur();
+      [coordinator addCoordinatedUnfocusingAnimations:^(id<UIFocusAnimationContext>  _Nonnull animationContext) {
           [self removeParallaxMotionEffects];
-          if (self->_eventEmitter) self->_eventEmitter->onBlur();
       } completion:^(void){[self disableDirectionalFocusGuides];}];
       [self resignFirstResponder];
     }
@@ -1701,7 +1697,7 @@ static RCTBorderStyle RCTBorderStyleFromOutlineStyle(OutlineStyle outlineStyle)
   const bool useCoreAnimationBorderRendering =
       borderMetrics.borderColors.isUniform() && borderMetrics.borderWidths.isUniform() &&
       borderMetrics.borderStyles.isUniform() && borderMetrics.borderStyles.left == BorderStyle::Solid &&
-      borderMetrics.borderRadii.isUniform() &&
+      areBorderRadiiCircular(borderMetrics.borderRadii) &&
       (
           // iOS draws borders in front of the content whereas CSS draws them behind
           // the content. For this reason, only use iOS border drawing when clipping
@@ -1783,7 +1779,7 @@ static RCTBorderStyle RCTBorderStyleFromOutlineStyle(OutlineStyle outlineStyle)
     _outlineLayer.frame = CGRectInset(
         layer.bounds, -_props->outlineOffset - _props->outlineWidth, -_props->outlineOffset - _props->outlineWidth);
 
-    if (borderMetrics.borderRadii.isUniform() && borderMetrics.borderRadii.topLeft.horizontal == 0) {
+    if (areBorderRadiiCircular(borderMetrics.borderRadii) && borderMetrics.borderRadii.topLeft.horizontal == 0) {
       UIColor *outlineColor = RCTUIColorFromSharedColor(_props->outlineColor);
       _outlineLayer.borderWidth = _props->outlineWidth;
       _outlineLayer.borderColor = outlineColor.CGColor;
@@ -1959,7 +1955,7 @@ static RCTBorderStyle RCTBorderStyleFromOutlineStyle(OutlineStyle outlineStyle)
   if (self.currentContainerView.clipsToBounds) {
     BOOL clipToPaddingBox = ReactNativeFeatureFlags::enableIOSViewClipToPaddingBox();
     if (!clipToPaddingBox) {
-      if (borderMetrics.borderRadii.isUniform()) {
+      if (areBorderRadiiCircular(borderMetrics.borderRadii)) {
         self.currentContainerView.layer.cornerRadius = borderMetrics.borderRadii.topLeft.horizontal;
       } else {
         CALayer *maskLayer =
@@ -1982,7 +1978,7 @@ static RCTBorderStyle RCTBorderStyleFromOutlineStyle(OutlineStyle outlineStyle)
       }
     } else if (
         !borderMetrics.borderWidths.isUniform() || borderMetrics.borderWidths.left != 0 ||
-        !borderMetrics.borderRadii.isUniform()) {
+        !areBorderRadiiCircular(borderMetrics.borderRadii)) {
       CALayer *maskLayer = [self createMaskLayer:RCTCGRectFromRect(_layoutMetrics.getPaddingFrame())
                                     cornerInsets:RCTGetCornerInsets(
                                                      RCTCornerRadiiFromBorderRadii(borderMetrics.borderRadii),
@@ -2001,7 +1997,7 @@ static RCTBorderStyle RCTBorderStyleFromOutlineStyle(OutlineStyle outlineStyle)
   // Bounds is needed here to account for scaling transforms properly and ensure
   // we do not scale twice
   layer.frame = CGRectMake(0, 0, self.layer.bounds.size.width, self.layer.bounds.size.height);
-  if (borderMetrics.borderRadii.isUniform()) {
+  if (areBorderRadiiCircular(borderMetrics.borderRadii)) {
     layer.mask = nil;
     layer.cornerRadius = borderMetrics.borderRadii.topLeft.horizontal;
     layer.cornerCurve = CornerCurveFromBorderCurve(borderMetrics.borderCurves.topLeft);

package/React/Fabric/Mounting/ComponentViews/VirtualView/RCTVirtualViewComponentView.mm

@@ -16,7 +16,6 @@
 #import <React/UIView+React.h>
 #import <jsi/jsi.h>
 
-#import <react/featureflags/ReactNativeFeatureFlags.h>
 #import <react/renderer/components/FBReactNativeSpec/ComponentDescriptors.h>
 #import <react/renderer/components/FBReactNativeSpec/EventEmitters.h>
 #import <react/renderer/components/FBReactNativeSpec/Props.h>
@@ -65,9 +64,6 @@ using namespace facebook::react;
 
   if (!_mode.has_value()) {
     _mode = newViewProps.initialHidden ? RCTVirtualViewModeHidden : RCTVirtualViewModeVisible;
-    if (ReactNativeFeatureFlags::hideOffscreenVirtualViewsOnIOS()) {
-      self.hidden = newViewProps.initialHidden && !sIsAccessibilityUsed;
-    }
   }
 
   switch (newViewProps.renderState) {
@@ -211,20 +207,6 @@ static BOOL sIsAccessibilityUsed = NO;
       [self _dispatchAsyncModeChange:event];
       break;
   }
-
-  if (ReactNativeFeatureFlags::hideOffscreenVirtualViewsOnIOS()) {
-    switch (newMode) {
-      case RCTVirtualViewModeVisible:
-        self.hidden = NO;
-        break;
-      case RCTVirtualViewModePrerender:
-        self.hidden = !sIsAccessibilityUsed;
-        break;
-      case RCTVirtualViewModeHidden:
-        self.hidden = YES;
-        break;
-    }
-  }
 }
 
 #pragma mark - Private API

package/React/Fabric/Mounting/RCTComponentViewFactory.mm

@@ -32,7 +32,9 @@
 #import <React/RCTComponentViewClassDescriptor.h>
 #import <React/RCTFabricComponentsPlugins.h>
 #import <React/RCTImageComponentView.h>
+#ifndef RCT_REMOVE_LEGACY_COMPONENT_INTEROP
 #import <React/RCTLegacyViewManagerInteropComponentView.h>
+#endif // RCT_REMOVE_LEGACY_COMPONENT_INTEROP
 #import <React/RCTMountingTransactionObserving.h>
 #import <React/RCTParagraphComponentView.h>
 #import <React/RCTRootComponentView.h>
@@ -125,11 +127,6 @@ static Class<RCTComponentViewProtocol> RCTComponentViewClassWithName(const char
     return;
   }
 
-  // Paper name: we prepare this variables to warn the user
-  // when the component is registered in both Fabric and in the
-  // interop layer, so they can remove that
-  NSString *componentNameString = RCTNSStringFromString(name);
-
   // Fallback 1: Call provider function for component view class.
   Class<RCTComponentViewProtocol> klass = RCTComponentViewClassWithName(name.c_str());
   if (klass != nullptr) {
@@ -149,6 +146,12 @@ static Class<RCTComponentViewProtocol> RCTComponentViewClassWithName(const char
     }
   }
 
+#ifndef RCT_REMOVE_LEGACY_COMPONENT_INTEROP
+  // Paper name: we prepare this variables to warn the user
+  // when the component is registered in both Fabric and in the
+  // interop layer, so they can remove that
+  NSString *componentNameString = RCTNSStringFromString(name);
+
   // Fallback 3: Try to use Paper Interop.
   // TODO(T174674274): Implement lazy loading of legacy view managers in the new architecture.
   if (RCTFabricInteropLayerEnabled() && [RCTLegacyViewManagerInteropComponentView isSupported:componentNameString]) {
@@ -166,6 +169,7 @@ static Class<RCTComponentViewProtocol> RCTComponentViewClassWithName(const char
     _registrationStatusMap.insert({provider.name, true});
     return;
   }
+#endif // RCT_REMOVE_LEGACY_COMPONENT_INTEROP
 
   // Fallback 4: use <UnimplementedView> if component doesn't exist.
   auto flavor = std::make_shared<const std::string>(name);

package/React/Fabric/RCTSurfacePresenter.mm

@@ -9,6 +9,7 @@
 
 #import <mutex>
 #import <shared_mutex>
+#import <unordered_set>
 
 #import <React/RCTAssert.h>
 #import <React/RCTBridge+Private.h>
@@ -42,8 +43,28 @@ using namespace facebook;
 using namespace facebook::react;
 
 @interface RCTSurfacePresenter () <RCTSchedulerDelegate, RCTMountingManagerDelegate>
+- (void)_drainPendingReactRevisionMerges;
 @end
 
+namespace {
+class ReactRevisionMergeRunLoopObserverDelegate final : public RunLoopObserver::Delegate {
+ public:
+  explicit ReactRevisionMergeRunLoopObserverDelegate(RCTSurfacePresenter *surfacePresenter)
+      : surfacePresenter_(surfacePresenter)
+  {
+  }
+
+  void activityDidChange(const RunLoopObserver::Delegate * /*delegate*/, RunLoopObserver::Activity /*activity*/)
+      const noexcept override
+  {
+    [surfacePresenter_ _drainPendingReactRevisionMerges];
+  }
+
+ private:
+  __weak RCTSurfacePresenter *surfacePresenter_;
+};
+} // namespace
+
 @implementation RCTSurfacePresenter {
   RCTMountingManager *_mountingManager; // Thread-safe.
   RCTSurfaceRegistry *_surfaceRegistry; // Thread-safe.
@@ -57,6 +78,12 @@ using namespace facebook::react;
 
   std::shared_mutex _observerListMutex;
   std::vector<__weak id<RCTSurfacePresenterObserver>> _observers; // Protected by `_observerListMutex`.
+
+  std::mutex _pendingReactRevisionMergesMutex;
+  // Pending React revision merges, drained on the main run loop just before it sleeps.
+  std::unordered_set<SurfaceId> _pendingReactRevisionMerges; // Protected by `_pendingReactRevisionMergesMutex`.
+  std::shared_ptr<ReactRevisionMergeRunLoopObserverDelegate> _mergeRunLoopObserverDelegate;
+  std::unique_ptr<const MainRunLoopObserver> _mergeRunLoopObserver;
 }
 
 - (instancetype)initWithContextContainer:(std::shared_ptr<const ContextContainer>)contextContainer
@@ -74,6 +101,14 @@ using namespace facebook::react;
     _mountingManager.contextContainer = contextContainer;
     _mountingManager.delegate = self;
 
+    if (ReactNativeFeatureFlags::enableFabricCommitBranching()) {
+      _mergeRunLoopObserverDelegate = std::make_shared<ReactRevisionMergeRunLoopObserverDelegate>(self);
+      _mergeRunLoopObserver = std::make_unique<const MainRunLoopObserver>(
+          RunLoopObserver::Activity::BeforeWaiting, _mergeRunLoopObserverDelegate);
+      _mergeRunLoopObserver->setDelegate(_mergeRunLoopObserverDelegate.get());
+      _mergeRunLoopObserver->enable();
+    }
+
     _scheduler = [self _createScheduler];
 
     [[NSNotificationCenter defaultCenter] addObserver:self
@@ -309,11 +344,57 @@ using namespace facebook::react;
 
 - (void)schedulerShouldMergeReactRevision:(SurfaceId)surfaceId
 {
-  auto scheduler = [self scheduler];
-  RCTExecuteOnMainQueue(^{
-    scheduler.uiManager->getShadowTreeRegistry().visit(
-        surfaceId, [](const ShadowTree &shadowTree) { shadowTree.mergeReactRevision(); });
-  });
+  if (RCTIsMainQueue()) {
+    [self _mergeReactRevisionForSurfaceId:surfaceId];
+    return;
+  }
+
+  bool needsWake = false;
+  {
+    std::lock_guard<std::mutex> lock(_pendingReactRevisionMergesMutex);
+    needsWake = _pendingReactRevisionMerges.empty();
+    _pendingReactRevisionMerges.insert(surfaceId);
+  }
+
+  if (needsWake) {
+    CFRunLoopWakeUp(CFRunLoopGetMain());
+  }
+}
+
+- (void)_mergeReactRevisionForSurfaceId:(SurfaceId)surfaceId
+{
+  RCTAssertMainQueue();
+  RCTScheduler *scheduler = [self scheduler];
+  if (!scheduler) {
+    return;
+  }
+
+  auto uiManager = scheduler.uiManager;
+  if (!uiManager) {
+    return;
+  }
+
+  uiManager->getShadowTreeRegistry().visit(
+      surfaceId, [](const ShadowTree &shadowTree) { shadowTree.mergeReactRevision(); });
+}
+
+- (void)_drainPendingReactRevisionMerges
+{
+  RCTAssertMainQueue();
+
+  std::unordered_set<SurfaceId> pending;
+  {
+    std::lock_guard<std::mutex> lock(_pendingReactRevisionMergesMutex);
+    if (_pendingReactRevisionMerges.empty()) {
+      return;
+    }
+
+    pending.swap(_pendingReactRevisionMerges);
+  }
+
+  for (auto surfaceId : pending) {
+    [self _mergeReactRevisionForSurfaceId:surfaceId];
+  }
 }
 
 - (void)schedulerDidDispatchCommand:(const ShadowView &)shadowView

package/React/Fabric/RCTSurfacePresenterBridgeAdapter.h

@@ -15,6 +15,7 @@ NS_ASSUME_NONNULL_BEGIN
 @class RCTSurfacePresenter;
 @class RCTBridge;
 
+#ifndef RCT_REMOVE_LEGACY_ARCH
 facebook::react::RuntimeExecutor RCTRuntimeExecutorFromBridge(RCTBridge *bridge);
 
 /*
@@ -39,5 +40,6 @@ facebook::react::RuntimeExecutor RCTRuntimeExecutorFromBridge(RCTBridge *bridge)
 @property (nonatomic, weak) RCTBridge *bridge;
 
 @end
+#endif
 
 NS_ASSUME_NONNULL_END

package/React/I18n/RCTLocalizedString.mm

@@ -7,8 +7,45 @@
 
 #import "RCTLocalizedString.h"
 
+#import <React/RCTLog.h>
+
 #if !defined(WITH_FBI18N) || !(WITH_FBI18N)
 
+// Anchors resource lookups to the bundle that contains this code: React.framework
+// when React Native is consumed prebuilt / via SwiftPM, or the app's main bundle
+// for static source builds.
+@interface RCTI18nStringsAnchor : NSObject
+@end
+@implementation RCTI18nStringsAnchor
+@end
+
+// Resolves RCTI18nStrings.bundle wherever it ships: the code's own bundle first
+// (prebuilt/SwiftPM embed it inside React.framework), then the app's main bundle
+// (source builds copy it there via the podspec resource_bundles). Returns nil
+// when absent, so the caller falls back to the untranslated default value.
+static NSBundle *RCTI18nStringsBundle(void)
+{
+  NSBundle *codeBundle = [NSBundle bundleForClass:[RCTI18nStringsAnchor class]];
+  NSURL *url = [codeBundle URLForResource:@"RCTI18nStrings" withExtension:@"bundle"];
+  if (url != nil) {
+    return [NSBundle bundleWithURL:url];
+  }
+  NSString *mainPath = [[NSBundle mainBundle] pathForResource:@"RCTI18nStrings" ofType:@"bundle"];
+  if (mainPath != nil) {
+    return [NSBundle bundleWithPath:mainPath];
+  }
+#if RCT_DEV
+  // Missing resources are otherwise silent (every lookup falls back to the
+  // untranslated default and the privacy manifest quietly drops out of the
+  // app's aggregated privacy report). Called once — the caller caches.
+  RCTLogWarn(
+      @"RCTI18nStrings.bundle not found in React.framework or the app bundle. Localized strings will use their "
+      @"untranslated defaults, and React's PrivacyInfo.xcprivacy may be missing from the app's privacy report. "
+      @"When consuming the prebuilt React.framework, verify it is embedded into the app with its resources intact.");
+#endif
+  return nil;
+}
+
 extern "C" {
 
 static NSString *FBTStringByConvertingIntegerToBase64(uint64_t number)
@@ -33,8 +70,7 @@ __attribute__((noinline)) uint64_t FBcoreLocalexxHash48(const char *input, uint6
 
 NSString *RCTLocalizedStringFromKey(uint64_t key, NSString *defaultValue)
 {
-  static NSBundle *bundle = [NSBundle bundleWithPath:[[NSBundle mainBundle] pathForResource:@"RCTI18nStrings"
-                                                                                     ofType:@"bundle"]];
+  static NSBundle *bundle = RCTI18nStringsBundle();
   if (bundle == nil) {
     return defaultValue;
   } else {

package/React/Modules/RCTEventEmitter.m

@@ -14,6 +14,12 @@
 @implementation RCTEventEmitter {
   NSInteger _listenerCount;
   BOOL _observationDisabled;
+  // Set to YES when -setCallableJSModules: is called with a non-nil value.
+  // _callableJSModules is weak and can return to nil after wiring (e.g. on
+  // host teardown) while this instance lives on, so the current value of
+  // _callableJSModules can't tell us whether we were ever set up correctly.
+  // This flag can.
+  BOOL _callableJSModulesWasInitialized;
 }
 
 @synthesize callableJSModules = _callableJSModules;
@@ -40,15 +46,14 @@
 
 - (void)sendEventWithName:(NSString *)eventName body:(id)body
 {
-  // Assert that subclasses of RCTEventEmitter does not have `@synthesize _callableJSModules`
-  // which would cause _callableJSModules in the parent RCTEventEmitter to be nil.
   RCTAssert(
-      _callableJSModules != nil,
-      @"Error when sending event: %@ with body: %@. "
+      _callableJSModulesWasInitialized,
+      @"Error when sending event: %@ (listenerCount: %lld) with body: %@. "
        "RCTCallableJSModules is not set. This is probably because you've "
        "explicitly synthesized the RCTCallableJSModules in %@, even though it's inherited "
        "from RCTEventEmitter.",
       eventName,
+      (long long)_listenerCount,
       body,
       [self class]);
 
@@ -60,14 +65,29 @@
         [[self supportedEvents] componentsJoinedByString:@"`, `"]);
   }
 
-  BOOL shouldEmitEvent = (_observationDisabled || _listenerCount > 0);
+  // _callableJSModules is weak, so read it exactly once into a strong local.
+  RCTCallableJSModules *callableJSModules = _callableJSModules;
+  if (!callableJSModules) {
+    RCTLogWarn(@"Sending `%@` but callableJSModules is nil, bridge was probably torn down", eventName);
+    return;
+  }
 
-  if (shouldEmitEvent && _callableJSModules) {
-    [_callableJSModules invokeModule:@"RCTDeviceEventEmitter"
-                              method:@"emit"
-                            withArgs:body ? @[ eventName, body ] : @[ eventName ]];
-  } else {
+  BOOL shouldEmitEvent = (_observationDisabled || _listenerCount > 0);
+  if (!shouldEmitEvent) {
     RCTLogInfo(@"Sending `%@` with no listeners registered.", eventName);
+    return;
+  }
+
+  [callableJSModules invokeModule:@"RCTDeviceEventEmitter"
+                           method:@"emit"
+                         withArgs:body ? @[ eventName, body ] : @[ eventName ]];
+}
+
+- (void)setCallableJSModules:(RCTCallableJSModules *)callableJSModules
+{
+  _callableJSModules = callableJSModules;
+  if (callableJSModules != nil) {
+    _callableJSModulesWasInitialized = YES;
   }
 }
 

package/React/Modules/RCTI18nUtil.m

@@ -95,7 +95,9 @@
   return direction == NSLocaleLanguageDirectionRightToLeft;
 }
 
-// Check if the current application language is RTL
+// Intersect Xcode "Localization" languages with the system languages and checks if the result is using RTL
+// For RTL support, app must add an RTL lang to .pbxproj's knownRegions = ( ... )
+// and user must have chosen an RTL language
 - (BOOL)isApplicationPreferredLanguageRTL
 {
   NSWritingDirection direction = [NSParagraphStyle defaultWritingDirectionForLanguage:nil];