Simplify

Author: kmichalikk

ios/RNSScreen.h

@@ -7,7 +7,6 @@
 #import "RNSScreenContentWrapper.h"
 #import "RNSScrollEdgeEffectApplicator.h"
 #import "RNSScrollViewBehaviorOverriding.h"
-#import "RNSViewInteractionManager.h"
 
 #if !TARGET_OS_TV
 #import "RNSOrientationProviding.h"
@@ -171,12 +170,6 @@ namespace react = facebook::react;
 - (BOOL)isModal;
 - (BOOL)isPresentedAsNativeModal;
 
-/**
- * Holds a shared instance to a service that finds the view that needs to have interactions disabled for stack to not
- * have multiple screen transitions at once.
- */
-+ (RNSViewInteractionManager *)viewInteractionManagerInstance;
-
 /**
  * Tell `Screen` component that it has been removed from react state and can safely cleanup
  * any retained resources.

ios/RNSScreen.mm

@@ -144,17 +144,6 @@ - (void)initCommonProps
 #endif // RCT_NEW_ARCH_ENABLED
 }
 
-+ (RNSViewInteractionManager *)viewInteractionManagerInstance
-{
-  static RNSViewInteractionManager *manager = nil;
-  static dispatch_once_t onceToken;
-  dispatch_once(&onceToken, ^{
-    manager = [[RNSViewInteractionManager alloc] init];
-  });
-
-  return manager;
-}
-
 - (BOOL)getFullScreenSwipeShadowEnabled
 {
   if (@available(iOS 26, *)) {
@@ -807,15 +796,15 @@ - (void)willMoveToWindow:(UIWindow *)newWindow
 
     // Use RNSViewInteractionManager util to find a suitable subtree to disable interations on,
     // starting from reactSuperview, because on Paper, self is not attached yet.
-    [RNSScreenView.viewInteractionManagerInstance disableInteractionsForSubtreeWith:self.reactSuperview];
+    self.reactSuperview.userInteractionEnabled = false;
   }
 }
 
 - (void)presentationControllerWillDismiss:(UIPresentationController *)presentationController
 {
   if (@available(iOS 26, *)) {
     // Disable interactions to disallow multiple modals dismissed at once; see willMoveToWindow
-    [RNSScreenView.viewInteractionManagerInstance disableInteractionsForSubtreeWith:self.reactSuperview];
+    self.reactSuperview.userInteractionEnabled = false;
   }
 
 #if !RCT_NEW_ARCH_ENABLED
@@ -846,7 +835,7 @@ - (void)presentationControllerDidAttemptToDismiss:(UIPresentationController *)pr
 {
   if (@available(iOS 26, *)) {
     // Reenable interactions; see presentationControllerWillDismiss
-    [RNSScreenView.viewInteractionManagerInstance enableInteractionsForLastSubtree];
+    self.reactSuperview.userInteractionEnabled = true;
   }
 
   // NOTE(kkafar): We should consider depracating the use of gesture cancel here & align
@@ -862,7 +851,7 @@ - (void)presentationControllerDidDismiss:(UIPresentationController *)presentatio
   if (@available(iOS 26, *)) {
     // Reenable interactions; see presentationControllerWillDismiss
     // Dismissed screen doesn't hold a reference to window, but presentingViewController.view does
-    [RNSScreenView.viewInteractionManagerInstance enableInteractionsForLastSubtree];
+    self.reactSuperview.userInteractionEnabled = true;
   }
 
   if ([_reactSuperview respondsToSelector:@selector(presentationControllerDidDismiss:)]) {
@@ -1666,7 +1655,7 @@ - (void)viewDidAppear:(BOOL)animated
 {
   if (@available(iOS 26, *)) {
     // Reenable interactions, see willMoveToWindow
-    [RNSScreenView.viewInteractionManagerInstance enableInteractionsForLastSubtree];
+    self.view.reactSuperview.userInteractionEnabled = true;
   }
   [super viewDidAppear:animated];
   if (!_isSwiping || _shouldNotify) {
@@ -1710,7 +1699,7 @@ - (void)viewDidDisappear:(BOOL)animated
 #endif
   if (@available(iOS 26, *)) {
     // Reenable interactions, see willMoveToWindow
-    [RNSScreenView.viewInteractionManagerInstance enableInteractionsForLastSubtree];
+    self.view.reactSuperview.userInteractionEnabled = true;
   }
 }
 

ios/RNSScreenStack.mm

@@ -412,12 +412,6 @@ - (void)didMoveToWindow
     [self maybeAddToParentAndUpdateContainer];
   }
 #endif
-  if (self.window == nil) {
-    // When hot reload happens that would remove the whole stack, disabling the interaction on a screen out transition
-    // will not be matched with enabling the interactions on another screen's in transition. We need to make sure
-    // that the subtree is interactive again
-    [RNSScreenView.viewInteractionManagerInstance enableInteractionsForLastSubtree];
-  }
 }
 
 - (void)maybeAddToParentAndUpdateContainer