Opt code

packages/react-native/Libraries/Text/TextInput/RCTBaseTextInputView.mm

@@ -34,9 +34,9 @@ @implementation RCTBaseTextInputView {
 
 - (void)reactUpdateResponderOffsetForScrollView:(RCTScrollView *)scrollView
 {
-  scrollView.firstResponderFocusView = self.backedTextInputView;
   if (![self isDescendantOfView:scrollView]) {
     // View is outside scroll view
+    scrollView.firstResponderViewOffScrollView = self.backedTextInputView;
     return;
   }
 

packages/react-native/React/Fabric/Mounting/ComponentViews/ScrollView/RCTScrollViewComponentView.h

@@ -38,8 +38,8 @@ NS_ASSUME_NONNULL_BEGIN
 /** Focus area of newly-activated text input relative to the window to compare against UIKeyboardFrameBegin/End */
 @property (nonatomic, assign) CGRect firstResponderFocus;
 
-/** newly-activated text input relative to the window to compare against UIKeyboardFrameBegin/End */
-@property (nonatomic, weak) UIView *firstResponderFocusView;
+/** newly-activated text input outside of the scroll view */
+@property (nonatomic, weak) UIView *firstResponderViewOffScrollView;
 
 /*
  * Returns the subview of the scroll view that the component uses to mount all subcomponents into. That's useful to

packages/react-native/React/Fabric/Mounting/ComponentViews/ScrollView/RCTScrollViewComponentView.mm

@@ -204,7 +204,7 @@ - (void)_keyboardWillChangeFrame:(NSNotification *)notification
                                                from:self
                                            forEvent:nil]) {
     if (CGRectEqualToRect(_firstResponderFocus, CGRectNull)) {
-      UIView *inputAccessoryView = _firstResponderFocusView.inputAccessoryView;
+      UIView *inputAccessoryView = _firstResponderViewOffScrollView.inputAccessoryView;
       if (inputAccessoryView) {
         // Text input view is within the inputAccessoryView.
         contentDiff = keyboardEndFrame.origin.y - keyboardBeginFrame.origin.y;

packages/react-native/React/Fabric/Mounting/ComponentViews/TextInput/RCTTextInputComponentView.mm

@@ -102,9 +102,9 @@ - (void)didMoveToWindow
 
 - (void)reactUpdateResponderOffsetForScrollView:(RCTScrollViewComponentView *)scrollView
 {
-  scrollView.firstResponderFocusView = _backedTextInputView;
   if (![self isDescendantOfView:scrollView.scrollView] || !_backedTextInputView.isFirstResponder) {
     // View is outside scroll view or it's not a first responder.
+    scrollView.firstResponderViewOffScrollView = _backedTextInputView;
     return;
   }
 

packages/react-native/React/Views/ScrollView/RCTScrollView.h

@@ -50,8 +50,8 @@
 @property (nonatomic, assign) BOOL inverted;
 /** Focus area of newly-activated text input relative to the window to compare against UIKeyboardFrameBegin/End */
 @property (nonatomic, assign) CGRect firstResponderFocus;
-/** newly-activated text input relative to the window to compare against UIKeyboardFrameBegin/End */
-@property (nonatomic, weak) UIView *firstResponderFocusView;
+/** newly-activated text input outside of the scroll view */
+@property (nonatomic, weak) UIView *firstResponderViewOffScrollView;
 
 // NOTE: currently these event props are only declared so we can export the
 // event names to JS - we don't call the blocks directly because scroll events

packages/react-native/React/Views/ScrollView/RCTScrollView.m

@@ -339,7 +339,7 @@ - (void)_keyboardWillChangeFrame:(NSNotification *)notification
       // Text field active region is below visible area with keyboard - update diff to bring into view
       contentDiff = endFrame.origin.y - focusEnd;
     } else {
-      UIView *inputAccessoryView = _firstResponderFocusView.inputAccessoryView;
+      UIView *inputAccessoryView = _firstResponderViewOffScrollView.inputAccessoryView;
       if (inputAccessoryView) {
         // Text input view is within the inputAccessoryView.
         contentDiff = endFrame.origin.y - beginFrame.origin.y;