fix(ios): fix broken transitions with autoFocus=true by moving to viewDidAppear

packages/react-native/Libraries/AppDelegate/RCTDefaultReactNativeFactoryDelegate.mm

@@ -7,6 +7,7 @@
 
 #import "RCTDefaultReactNativeFactoryDelegate.h"
 #import <ReactCommon/RCTHost.h>
+#import <React/RCTViewController.h>
 #import "RCTAppSetupUtils.h"
 #import "RCTDependencyProvider.h"
 #if USE_THIRD_PARTY_JSC != 1
@@ -28,7 +29,7 @@ - (NSURL *_Nullable)sourceURLForBridge:(nonnull RCTBridge *)bridge
 
 - (UIViewController *)createRootViewController
 {
-  return [UIViewController new];
+  return [RCTViewController new];
 }
 
 - (RCTBridge *)createBridgeWithDelegate:(id<RCTBridgeDelegate>)delegate launchOptions:(NSDictionary *)launchOptions

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

@@ -17,6 +17,8 @@
 #import <React/RCTUITextField.h>
 #import <React/RCTUITextView.h>
 #import <React/RCTUtils.h>
+#import <React/UIView+React.h>
+#import <React/UIViewController+React.h>
 
 #import "RCTConversions.h"
 #import "RCTTextInputNativeCommands.h"
@@ -32,6 +34,7 @@
 
 @interface RCTTextInputComponentView () <
     RCTBackedTextInputDelegate,
+    RCTViewControllerAppearanceListener,
     RCTTextInputViewProtocol
 #if !TARGET_OS_TV
     ,
@@ -70,6 +73,8 @@ @implementation RCTTextInputComponentView {
    */
   BOOL _comingFromJS;
   BOOL _didMoveToWindow;
+  BOOL _didAutoFocus;
+  __weak UIViewController *_viewController;
 
   /*
    * Newly initialized default typing attributes contain a no-op NSParagraphStyle and NSShadow. These cause inequality
@@ -95,6 +100,7 @@ - (instancetype)initWithFrame:(CGRect)frame
     _ignoreNextTextInputCall = NO;
     _comingFromJS = NO;
     _didMoveToWindow = NO;
+    _didAutoFocus = NO;
     _originalTypingAttributes = [_backedTextInputView.typingAttributes copy];
     _previousContentSize = CGSizeZero;
 
@@ -121,13 +127,18 @@ - (void)didMoveToWindow
 {
   [super didMoveToWindow];
 
+  bool enableNewAutoFocusImpl = ReactNativeFeatureFlags::enableIOSExperimentalAutoFocusImplementation();
+  if (enableNewAutoFocusImpl) {
+    [_viewController reactRemoveViewControllerAppearanceListener:self];
+    _viewController = self.window ? [self reactViewController] : nil;
+    [_viewController reactAddViewControllerAppearanceListener:self];
+  }
+
   if (self.window && !_didMoveToWindow) {
-    const auto &props = static_cast<const TextInputProps &>(*_props);
-    if (props.autoFocus) {
-      [_backedTextInputView becomeFirstResponder];
-      [self scrollCursorIntoView];
-    }
     _didMoveToWindow = YES;
+    if (!enableNewAutoFocusImpl) {
+      [self tryAutoFocus];
+    }
     [self initializeReturnKeyType];
   }
 
@@ -384,12 +395,32 @@ - (void)prepareForRecycle
   _lastStringStateWasUpdatedWith = nil;
   _ignoreNextTextInputCall = NO;
   _didMoveToWindow = NO;
+  _didAutoFocus = NO;
+  [_viewController reactRemoveViewControllerAppearanceListener:self];
+  _viewController = nil;
   _backedTextInputView.inputAccessoryViewID = nil;
   _backedTextInputView.inputAccessoryView = nil;
   _hasInputAccessoryView = false;
   [_backedTextInputView resignFirstResponder];
 }
 
+#pragma mark - Auto focus / RCTViewControllerAppearanceListener
+
+- (void)tryAutoFocus
+{
+  const auto &props = static_cast<const TextInputProps &>(*_props);
+  if (props.autoFocus && !_didAutoFocus) {
+    _didAutoFocus = YES;
+    [_backedTextInputView becomeFirstResponder];
+    [self scrollCursorIntoView];
+  }
+}
+
+- (void)reactViewControllerDidAppear:(UIViewController *)viewController animated:(BOOL)animated
+{
+  [self tryAutoFocus];
+}
+
 #pragma mark - RCTBackedTextInputDelegate
 
 - (BOOL)textInputShouldBeginEditing

packages/react-native/React/Views/RCTViewController.h

@@ -0,0 +1,17 @@
+/*
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+
+#import <UIKit/UIKit.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface RCTViewController : UIViewController
+
+@end
+
+NS_ASSUME_NONNULL_END

packages/react-native/React/Views/RCTViewController.m

@@ -0,0 +1,29 @@
+//
+//  RCTViewController.m
+//  React-Core
+//
+//  Created by Hanno Goedecke on 27.04.26.
+//
+
+#import "RCTViewController.h"
+#import <React/UIViewController+React.h>
+
+@interface RCTViewController ()
+
+@end
+
+@implementation RCTViewController
+
+- (void)viewDidAppear:(BOOL)animated
+{
+  [super viewDidAppear:animated];
+  [self reactNotifyViewControllerDidAppear:animated];
+}
+
+- (void)viewDidDisappear:(BOOL)animated
+{
+  [super viewDidDisappear:animated];
+  [self reactNotifyViewControllerDidDisappear:animated];
+}
+
+@end

packages/react-native/React/Views/RCTWrapperViewController.h

@@ -5,11 +5,11 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-#import <UIKit/UIKit.h>
+#import <React/RCTViewController.h>
 
 @class RCTWrapperViewController;
 
-@interface RCTWrapperViewController : UIViewController
+@interface RCTWrapperViewController : RCTViewController
 
 - (instancetype)initWithContentView:(UIView *)contentView NS_DESIGNATED_INITIALIZER;
 

packages/react-native/React/Views/UIViewController+React.h

@@ -0,0 +1,36 @@
+/*
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#import <UIKit/UIKit.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@protocol RCTViewControllerAppearanceListener <NSObject>
+
+@optional
+- (void)reactViewControllerDidAppear:(UIViewController *)viewController animated:(BOOL)animated;
+- (void)reactViewControllerDidDisappear:(UIViewController *)viewController animated:(BOOL)animated;
+
+@end
+
+@interface UIViewController (React)
+
+@property (nonatomic, assign, readonly) BOOL reactViewControllerIsVisible;
+
+- (void)reactAddViewControllerAppearanceListener:(id<RCTViewControllerAppearanceListener>)listener;
+- (void)reactRemoveViewControllerAppearanceListener:(id<RCTViewControllerAppearanceListener>)listener;
+
+/**
+ * Call from `viewDidAppear:` / `viewDidDisappear:` in UIViewController subclasses
+ * that want to notify registered React Native appearance listeners.
+ */
+- (void)reactNotifyViewControllerDidAppear:(BOOL)animated;
+- (void)reactNotifyViewControllerDidDisappear:(BOOL)animated;
+
+@end
+
+NS_ASSUME_NONNULL_END

packages/react-native/React/Views/UIViewController+React.m

@@ -0,0 +1,89 @@
+/*
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#import "UIViewController+React.h"
+
+#import <objc/runtime.h>
+
+@interface RCTViewControllerAppearanceState : NSObject
+
+@property (nonatomic, strong, readonly) NSHashTable<id<RCTViewControllerAppearanceListener>> *listeners;
+@property (nonatomic, assign) BOOL visible;
+
+@end
+
+@implementation RCTViewControllerAppearanceState
+
+- (instancetype)init
+{
+  if (self = [super init]) {
+    _listeners = [NSHashTable weakObjectsHashTable];
+  }
+  return self;
+}
+
+@end
+
+@implementation UIViewController (React)
+
+- (RCTViewControllerAppearanceState *)reactViewControllerAppearanceState
+{
+  RCTViewControllerAppearanceState *state =
+      objc_getAssociatedObject(self, @selector(reactViewControllerAppearanceState));
+  if (!state) {
+    state = [RCTViewControllerAppearanceState new];
+    objc_setAssociatedObject(
+        self, @selector(reactViewControllerAppearanceState), state, OBJC_ASSOCIATION_RETAIN_NONATOMIC);
+  }
+  return state;
+}
+
+- (BOOL)reactViewControllerIsVisible
+{
+  return [self reactViewControllerAppearanceState].visible;
+}
+
+- (void)reactAddViewControllerAppearanceListener:(id<RCTViewControllerAppearanceListener>)listener
+{
+  RCTViewControllerAppearanceState *state = [self reactViewControllerAppearanceState];
+  [state.listeners addObject:listener];
+
+  if (state.visible && [listener respondsToSelector:@selector(reactViewControllerDidAppear:animated:)]) {
+    [listener reactViewControllerDidAppear:self animated:NO];
+  }
+}
+
+- (void)reactRemoveViewControllerAppearanceListener:(id<RCTViewControllerAppearanceListener>)listener
+{
+  [[self reactViewControllerAppearanceState].listeners removeObject:listener];
+}
+
+- (void)reactNotifyViewControllerDidAppear:(BOOL)animated
+{
+  RCTViewControllerAppearanceState *state = [self reactViewControllerAppearanceState];
+  state.visible = YES;
+
+  for (id<RCTViewControllerAppearanceListener> listener in state.listeners.allObjects) {
+    if ([listener respondsToSelector:@selector(reactViewControllerDidAppear:animated:)]) {
+      [listener reactViewControllerDidAppear:self animated:animated];
+    }
+  }
+}
+
+- (void)reactNotifyViewControllerDidDisappear:(BOOL)animated
+{
+  RCTViewControllerAppearanceState *state = [self reactViewControllerAppearanceState];
+  state.visible = NO;
+
+  for (id<RCTViewControllerAppearanceListener> listener in state.listeners.allObjects) {
+    if ([listener respondsToSelector:@selector(reactViewControllerDidDisappear:animated:)]) {
+      [listener reactViewControllerDidDisappear:self animated:animated];
+    }
+  }
+}
+
+@end

packages/react-native/ReactAndroid/src/main/java/com/facebook/react/internal/featureflags/ReactNativeFeatureFlags.kt

@@ -4,7 +4,7 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @generated SignedSource<<eb70fd41bc36f1a49849e29bea081007>>
+ * @generated SignedSource<<1e2cf81bf4354a7e3d9d09384d813cfc>>
  */
 
 /**
@@ -186,6 +186,12 @@ public object ReactNativeFeatureFlags {
   @JvmStatic
   public fun enableFontScaleChangesUpdatingLayout(): Boolean = accessor.enableFontScaleChangesUpdatingLayout()
 
+  /**
+   * Fixes #56595 by moving the autoFocus from didMoveToWindow to viewDidAppear
+   */
+  @JvmStatic
+  public fun enableIOSExperimentalAutoFocusImplementation(): Boolean = accessor.enableIOSExperimentalAutoFocusImplementation()
+
   /**
    * Applies base offset for each line of text separately on iOS.
    */

packages/react-native/ReactAndroid/src/main/java/com/facebook/react/internal/featureflags/ReactNativeFeatureFlagsCxxAccessor.kt

@@ -4,7 +4,7 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @generated SignedSource<<f79ca61a0da053a1661eca4d3a35b081>>
+ * @generated SignedSource<<8dd2a1c47c059810961eb66b13b18dc1>>
  */
 
 /**
@@ -46,6 +46,7 @@ internal class ReactNativeFeatureFlagsCxxAccessor : ReactNativeFeatureFlagsAcces
   private var enableFabricLogsCache: Boolean? = null
   private var enableFabricRendererCache: Boolean? = null
   private var enableFontScaleChangesUpdatingLayoutCache: Boolean? = null
+  private var enableIOSExperimentalAutoFocusImplementationCache: Boolean? = null
   private var enableIOSTextBaselineOffsetPerLineCache: Boolean? = null
   private var enableIOSViewClipToPaddingBoxCache: Boolean? = null
   private var enableImagePrefetchingAndroidCache: Boolean? = null
@@ -346,6 +347,15 @@ internal class ReactNativeFeatureFlagsCxxAccessor : ReactNativeFeatureFlagsAcces
     return cached
   }
 
+  override fun enableIOSExperimentalAutoFocusImplementation(): Boolean {
+    var cached = enableIOSExperimentalAutoFocusImplementationCache
+    if (cached == null) {
+      cached = ReactNativeFeatureFlagsCxxInterop.enableIOSExperimentalAutoFocusImplementation()
+      enableIOSExperimentalAutoFocusImplementationCache = cached
+    }
+    return cached
+  }
+
   override fun enableIOSTextBaselineOffsetPerLine(): Boolean {
     var cached = enableIOSTextBaselineOffsetPerLineCache
     if (cached == null) {

packages/react-native/ReactAndroid/src/main/java/com/facebook/react/internal/featureflags/ReactNativeFeatureFlagsCxxInterop.kt

@@ -4,7 +4,7 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @generated SignedSource<<62d1f0fcdf8e3165480da12575d62826>>
+ * @generated SignedSource<<a6ccb3bb68e8b300fdabf085e7ea6979>>
  */
 
 /**
@@ -80,6 +80,8 @@ public object ReactNativeFeatureFlagsCxxInterop {
 
   @DoNotStrip @JvmStatic public external fun enableFontScaleChangesUpdatingLayout(): Boolean
 
+  @DoNotStrip @JvmStatic public external fun enableIOSExperimentalAutoFocusImplementation(): Boolean
+
   @DoNotStrip @JvmStatic public external fun enableIOSTextBaselineOffsetPerLine(): Boolean
 
   @DoNotStrip @JvmStatic public external fun enableIOSViewClipToPaddingBox(): Boolean

packages/react-native/ReactAndroid/src/main/java/com/facebook/react/internal/featureflags/ReactNativeFeatureFlagsDefaults.kt

@@ -4,7 +4,7 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @generated SignedSource<<84ac5b80585f9185c879c81822718d86>>
+ * @generated SignedSource<<27361d399f26a6f7462a82f9fbfd5d48>>
  */
 
 /**
@@ -75,6 +75,8 @@ public open class ReactNativeFeatureFlagsDefaults : ReactNativeFeatureFlagsProvi
 
   override fun enableFontScaleChangesUpdatingLayout(): Boolean = true
 
+  override fun enableIOSExperimentalAutoFocusImplementation(): Boolean = false
+
   override fun enableIOSTextBaselineOffsetPerLine(): Boolean = false
 
   override fun enableIOSViewClipToPaddingBox(): Boolean = false