react-native-screens 3.14.0 → 3.16.0

package/README.md

@@ -18,7 +18,31 @@ To learn about how to use `react-native-screens` with Fabric architecture, head
 
 ### iOS
 
-Installation on iOS should be completely handled with auto-linking, if you have ensured pods are installed after adding this module, no other actions should be necessary.
+On iOS obtaining current device orientation [requires asking the system to generate orientation notifications](https://developer.apple.com/documentation/uikit/uidevice/1620053-orientation?language=objc). Our library uses them to enforce correct interface orientation when navigating between screens. 
+To make sure that there are no issues with screen orientation you should put following code in your `AppDelegate.m`:
+
+```objective-c
+- (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions
+{
+    ... 
+#if !TARGET_OS_TV
+    [[UIDevice currentDevice] beginGeneratingDeviceOrientationNotifications];
+#endif // !TARGET_OS_TV
+    ...
+    return YES:
+}
+
+- (void)applicationWillTerminate:(UIApplication *)application
+{
+#if !TARGET_OS_TV
+    [[UIDevice currentDevice] endGeneratingDeviceOrientationNotifications];
+#endif // !TARGET_OS_TV
+}
+```
+
+You can see example of these changes being introduced in our [example applications](https://github.com/software-mansion/react-native-screens/blob/main/TestsExample/ios/TestsExample/AppDelegate.mm).
+
+Other aspects of installation should be completely handled with auto-linking, just ensure you installed pods after adding this module.
 
 ### Android
 
@@ -71,9 +95,18 @@ Screens are already integrated with the React Native's most popular navigation l
 
 | version | react-native version |
 | ------- | -------------------- |
+| 3.14.0+ | 0.64.0+              |
 | 3.0.0+  | 0.62.0+              |
 | 2.0.0+  | 0.60.0+              |
 
+### Support for Fabric
+[Fabric](https://reactnative.dev/architecture/fabric-renderer) is React Native's new rendering system. As of [version `3.14.0`](https://github.com/software-mansion/react-native-screens/releases/tag/3.14.0) of this project, Fabric is supported only for react-native 0.69+. Support for `0.68.x` has been dropped.
+
+| version | react-native version |
+| ------- | -------------------- |
+| 3.14.0+ | 0.69.0+              |
+
+
 ## Usage with [react-navigation](https://github.com/react-navigation/react-navigation)
 
 Screens support is built into [react-navigation](https://github.com/react-navigation/react-navigation) starting from version [2.14.0](https://github.com/react-navigation/react-navigation/releases/tag/2.14.0) for all the different navigator types (stack, tab, drawer, etc).

package/RNScreens.podspec

@@ -4,9 +4,6 @@ package = JSON.parse(File.read(File.join(__dir__, "package.json")))
 
 fabric_enabled = ENV['RCT_NEW_ARCH_ENABLED'] == '1'
 
-# folly_version must match the version used in React Native
-# See folly_version in react-native/React/FBReactNativeSpec/FBReactNativeSpec.podspec
-folly_version = '2021.06.28.00-v2'
 folly_compiler_flags = '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -Wno-comma -Wno-shorten-64-to-32'
 
 Pod::Spec.new do |s|
@@ -36,7 +33,7 @@ Pod::Spec.new do |s|
     s.dependency "React"
     s.dependency "React-RCTFabric"
     s.dependency "React-Codegen"
-    s.dependency "RCT-Folly", folly_version
+    s.dependency "RCT-Folly"
     s.dependency "RCTRequired"
     s.dependency "RCTTypeSafety"
     s.dependency "ReactCommon/turbomodule/core"

package/android/build.gradle

@@ -50,7 +50,7 @@ android {
     }
 
     defaultConfig {
-        minSdkVersion safeExtGet('minSdkVersion', 16)
+        minSdkVersion safeExtGet('minSdkVersion', 21)
         targetSdkVersion safeExtGet('targetSdkVersion', 22)
         versionCode 1
         versionName "1.0"

package/android/src/main/java/com/swmansion/rnscreens/Screen.kt

@@ -8,13 +8,8 @@ import android.util.SparseArray
 import android.view.ViewGroup
 import android.view.WindowManager
 import android.webkit.WebView
-import androidx.annotation.UiThread
 import com.facebook.react.bridge.GuardedRunnable
 import com.facebook.react.bridge.ReactContext
-import com.facebook.react.bridge.ReadableMap
-import com.facebook.react.bridge.WritableMap
-import com.facebook.react.bridge.WritableNativeMap
-import com.facebook.react.uimanager.PixelUtil
 import com.facebook.react.uimanager.UIManagerModule
 
 @SuppressLint("ViewConstructor")

package/android/src/main/java/com/swmansion/rnscreens/ScreenContainer.kt

@@ -135,6 +135,41 @@ open class ScreenContainer<T : ScreenFragment>(context: Context?) : ViewGroup(co
         performUpdatesNow()
     }
 
+    private fun findFragmentManagerForReactRootView(rootView: ReactRootView): FragmentManager {
+        var context = rootView.context
+
+        // ReactRootView is expected to be initialized with the main React Activity as a context but
+        // in case of Expo the activity is wrapped in ContextWrapper and we need to unwrap it
+        while (context !is FragmentActivity && context is ContextWrapper) {
+            context = context.baseContext
+        }
+
+        check(context is FragmentActivity) {
+            "In order to use RNScreens components your app's activity need to extend ReactActivity"
+        }
+
+        // In case React Native is loaded on a Fragment (not directly in activity) we need to find
+        // fragment manager whose fragment's view is ReactRootView. As of now, we detect such case by
+        // checking whether any fragments are attached to activity which hosts ReactRootView.
+        // See: https://github.com/software-mansion/react-native-screens/issues/1506 on why the cases
+        // must be treated separately.
+        return if (context.supportFragmentManager.fragments.isEmpty()) {
+            // We are in standard React Native application w/o custom native navigation based on fragments.
+            context.supportFragmentManager
+        } else {
+            // We are in some custom setup & we want to use the closest fragment manager in hierarchy.
+            // `findFragment` method throws IllegalStateException when it fails to resolve appropriate
+            // fragment. It might happen when e.g. React Native is loaded directly in Activity
+            // but some custom fragments are still used. Such use case seems highly unlikely
+            // so, as for now we let application crash.
+            try {
+                FragmentManager.findFragment<Fragment>(rootView).childFragmentManager
+            } catch (ex: IllegalStateException) {
+                throw IllegalStateException("Failed to find fragment for React Root View")
+            }
+        }
+    }
+
     private fun setupFragmentManager() {
         var parent: ViewParent = this
         // We traverse view hierarchy up until we find screen parent or a root view
@@ -146,28 +181,22 @@ open class ScreenContainer<T : ScreenFragment>(context: Context?) : ViewGroup(co
         // If parent is of type Screen it means we are inside a nested fragment structure.
         // Otherwise we expect to connect directly with root view and get root fragment manager
         if (parent is Screen) {
-            val screenFragment = parent.fragment
-            check(screenFragment != null) { "Parent Screen does not have its Fragment attached" }
-            mParentScreenFragment = screenFragment
-            screenFragment.registerChildScreenContainer(this)
-            setFragmentManager(screenFragment.childFragmentManager)
-            return
-        }
-
-        // we expect top level view to be of type ReactRootView, this isn't really necessary but in
-        // order to find root view we test if parent is null. This could potentially happen also when
-        // the view is detached from the hierarchy and that test would not correctly indicate the root
-        // view. So in order to make sure we indeed reached the root we test if it is of a correct type.
-        // This allows us to provide a more descriptive error message for the aforementioned case.
-        check(parent is ReactRootView) { "ScreenContainer is not attached under ReactRootView" }
-        // ReactRootView is expected to be initialized with the main React Activity as a context but
-        // in case of Expo the activity is wrapped in ContextWrapper and we need to unwrap it
-        var context = parent.context
-        while (context !is FragmentActivity && context is ContextWrapper) {
-            context = context.baseContext
+            checkNotNull(
+                parent.fragment?.let { screenFragment ->
+                    mParentScreenFragment = screenFragment
+                    screenFragment.registerChildScreenContainer(this)
+                    setFragmentManager(screenFragment.childFragmentManager)
+                }
+            ) { "Parent Screen does not have its Fragment attached" }
+        } else {
+            // we expect top level view to be of type ReactRootView, this isn't really necessary but in
+            // order to find root view we test if parent is null. This could potentially happen also when
+            // the view is detached from the hierarchy and that test would not correctly indicate the root
+            // view. So in order to make sure we indeed reached the root we test if it is of a correct type.
+            // This allows us to provide a more descriptive error message for the aforementioned case.
+            check(parent is ReactRootView) { "ScreenContainer is not attached under ReactRootView" }
+            setFragmentManager(findFragmentManagerForReactRootView(parent))
         }
-        check(context is FragmentActivity) { "In order to use RNScreens components your app's activity need to extend ReactActivity" }
-        setFragmentManager(context.supportFragmentManager)
     }
 
     protected fun createTransaction(): FragmentTransaction {

package/android/src/main/java/com/swmansion/rnscreens/ScreenFragment.kt

@@ -12,8 +12,9 @@ import android.widget.FrameLayout
 import androidx.fragment.app.Fragment
 import com.facebook.react.bridge.ReactContext
 import com.facebook.react.bridge.UiThreadUtil
-import com.facebook.react.uimanager.UIManagerModule
+import com.facebook.react.uimanager.UIManagerHelper
 import com.facebook.react.uimanager.events.Event
+import com.facebook.react.uimanager.events.EventDispatcher
 import com.swmansion.rnscreens.events.HeaderBackButtonClickedEvent
 import com.swmansion.rnscreens.events.ScreenAppearEvent
 import com.swmansion.rnscreens.events.ScreenDisappearEvent
@@ -204,10 +205,10 @@ open class ScreenFragment : Fragment {
                     ScreenLifecycleEvent.WillDisappear -> ScreenWillDisappearEvent(it.id)
                     ScreenLifecycleEvent.Disappear -> ScreenDisappearEvent(it.id)
                 }
-                (it.context as ReactContext)
-                    .getNativeModule(UIManagerModule::class.java)
-                    ?.eventDispatcher
-                    ?.dispatchEvent(lifecycleEvent)
+                val screenContext = screen.context as ReactContext
+                val eventDispatcher: EventDispatcher? =
+                    UIManagerHelper.getEventDispatcherForReactTag(screenContext, screen.id)
+                eventDispatcher?.dispatchEvent(lifecycleEvent)
                 fragment.dispatchEventInChildContainers(event)
             }
         }
@@ -224,10 +225,10 @@ open class ScreenFragment : Fragment {
     }
 
     fun dispatchHeaderBackButtonClickedEvent() {
-        (screen.context as ReactContext)
-            .getNativeModule(UIManagerModule::class.java)
-            ?.eventDispatcher
-            ?.dispatchEvent(HeaderBackButtonClickedEvent(screen.id))
+        val screenContext = screen.context as ReactContext
+        val eventDispatcher: EventDispatcher? =
+            UIManagerHelper.getEventDispatcherForReactTag(screenContext, screen.id)
+        eventDispatcher?.dispatchEvent(HeaderBackButtonClickedEvent(screen.id))
     }
 
     fun dispatchTransitionProgress(alpha: Float, closing: Boolean) {
@@ -242,14 +243,14 @@ open class ScreenFragment : Fragment {
                 val coalescingKey = (if (mProgress == 0.0f) 1 else if (mProgress == 1.0f) 2 else 3).toShort()
                 val container: ScreenContainer<*>? = screen.container
                 val goingForward = if (container is ScreenStack) container.goingForward else false
-                (screen.context as ReactContext)
-                    .getNativeModule(UIManagerModule::class.java)
-                    ?.eventDispatcher
-                    ?.dispatchEvent(
-                        ScreenTransitionProgressEvent(
-                            screen.id, mProgress, closing, goingForward, coalescingKey
-                        )
+                val screenContext = screen.context as ReactContext
+                val eventDispatcher: EventDispatcher? =
+                    UIManagerHelper.getEventDispatcherForReactTag(screenContext, screen.id)
+                eventDispatcher?.dispatchEvent(
+                    ScreenTransitionProgressEvent(
+                        screen.id, mProgress, closing, goingForward, coalescingKey
                     )
+                )
             }
         }
     }
@@ -302,11 +303,11 @@ open class ScreenFragment : Fragment {
         val container = screen.container
         if (container == null || !container.hasScreen(this)) {
             // we only send dismissed even when the screen has been removed from its container
-            if (screen.context is ReactContext) {
-                (screen.context as ReactContext)
-                    .getNativeModule(UIManagerModule::class.java)
-                    ?.eventDispatcher
-                    ?.dispatchEvent(ScreenDismissedEvent(screen.id))
+            val screenContext = screen.context
+            if (screenContext is ReactContext) {
+                val eventDispatcher: EventDispatcher? =
+                    UIManagerHelper.getEventDispatcherForReactTag(screenContext, screen.id)
+                eventDispatcher?.dispatchEvent(ScreenDismissedEvent(screen.id))
             }
         }
         mChildScreenContainers.clear()

package/android/src/main/java/com/swmansion/rnscreens/ScreenStack.kt

@@ -4,7 +4,8 @@ import android.content.Context
 import android.graphics.Canvas
 import android.view.View
 import com.facebook.react.bridge.ReactContext
-import com.facebook.react.uimanager.UIManagerModule
+import com.facebook.react.uimanager.UIManagerHelper
+import com.facebook.react.uimanager.events.EventDispatcher
 import com.swmansion.rnscreens.Screen.StackAnimation
 import com.swmansion.rnscreens.events.StackFinishTransitioningEvent
 import java.util.Collections
@@ -67,10 +68,11 @@ class ScreenStack(context: Context?) : ScreenContainer<ScreenStackFragment>(cont
     }
 
     private fun dispatchOnFinishTransitioning() {
-        (context as ReactContext)
-            .getNativeModule(UIManagerModule::class.java)
-            ?.eventDispatcher
-            ?.dispatchEvent(StackFinishTransitioningEvent(id))
+        val eventDispatcher: EventDispatcher? =
+            UIManagerHelper.getEventDispatcherForReactTag((context as ReactContext), id)
+        eventDispatcher?.dispatchEvent(
+            StackFinishTransitioningEvent(id)
+        )
     }
 
     override fun removeScreenAt(index: Int) {

package/android/src/main/java/com/swmansion/rnscreens/ScreenStackHeaderConfig.kt

@@ -130,7 +130,6 @@ class ScreenStackHeaderConfig(context: Context) : ViewGroup(context) {
             return null
         }
 
-    @SuppressLint("ObsoleteSdkInt") // to be removed when support for < 0.64 is dropped
     fun onUpdate() {
         val stack = screenStack
         val isTop = stack == null || stack.topScreen == parent
@@ -138,7 +137,7 @@ class ScreenStackHeaderConfig(context: Context) : ViewGroup(context) {
             return
         }
         val activity = screenFragment?.activity as AppCompatActivity? ?: return
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1 && mDirection != null) {
+        if (mDirection != null) {
             if (mDirection == "rtl") {
                 toolbar.layoutDirection = LAYOUT_DIRECTION_RTL
             } else if (mDirection == "ltr") {

package/android/src/main/java/com/swmansion/rnscreens/ScreenStackViewManager.kt

@@ -3,6 +3,7 @@ package com.swmansion.rnscreens
 import android.view.View
 import android.view.ViewGroup
 import com.facebook.react.bridge.ReactApplicationContext
+import com.facebook.react.common.MapBuilder
 import com.facebook.react.module.annotations.ReactModule
 import com.facebook.react.uimanager.LayoutShadowNode
 import com.facebook.react.uimanager.ThemedReactContext
@@ -10,6 +11,7 @@ import com.facebook.react.uimanager.ViewGroupManager
 import com.facebook.react.uimanager.ViewManagerDelegate
 import com.facebook.react.viewmanagers.RNSScreenStackManagerDelegate
 import com.facebook.react.viewmanagers.RNSScreenStackManagerInterface
+import com.swmansion.rnscreens.events.StackFinishTransitioningEvent
 
 @ReactModule(name = ScreenStackViewManager.REACT_CLASS)
 class ScreenStackViewManager : ViewGroupManager<ScreenStack>(), RNSScreenStackManagerInterface<ScreenStack> {
@@ -81,6 +83,13 @@ class ScreenStackViewManager : ViewGroupManager<ScreenStack>(), RNSScreenStackMa
         return mDelegate
     }
 
+    override fun getExportedCustomDirectEventTypeConstants(): MutableMap<String, Any> {
+        return MapBuilder.of(
+            StackFinishTransitioningEvent.EVENT_NAME,
+            MapBuilder.of("registrationName", "onFinishTransitioning"),
+        )
+    }
+
     companion object {
         const val REACT_CLASS = "RNSScreenStack"
     }

package/android/src/main/java/com/swmansion/rnscreens/ScreenViewManager.kt

@@ -162,7 +162,7 @@ class ScreenViewManager : ViewGroupManager<Screen>(), RNSScreenManagerInterface<
     override fun setSwipeDirection(view: Screen?, value: String?) = Unit
 
     override fun getExportedCustomDirectEventTypeConstants(): MutableMap<String, Any> {
-        val map: MutableMap<String, Any> = MapBuilder.of(
+        return MapBuilder.of(
             ScreenDismissedEvent.EVENT_NAME,
             MapBuilder.of("registrationName", "onDismissed"),
             ScreenWillAppearEvent.EVENT_NAME,
@@ -173,14 +173,11 @@ class ScreenViewManager : ViewGroupManager<Screen>(), RNSScreenManagerInterface<
             MapBuilder.of("registrationName", "onWillDisappear"),
             ScreenDisappearEvent.EVENT_NAME,
             MapBuilder.of("registrationName", "onDisappear"),
-            StackFinishTransitioningEvent.EVENT_NAME,
-            MapBuilder.of("registrationName", "onFinishTransitioning"),
+            HeaderBackButtonClickedEvent.EVENT_NAME,
+            MapBuilder.of("registrationName", "onHeaderBackButtonClicked"),
             ScreenTransitionProgressEvent.EVENT_NAME,
             MapBuilder.of("registrationName", "onTransitionProgress")
         )
-        // there is no `MapBuilder.of` with more than 7 items
-        map[HeaderBackButtonClickedEvent.EVENT_NAME] = MapBuilder.of("registrationName", "onHeaderBackButtonClicked")
-        return map
     }
 
     protected override fun getDelegate(): ViewManagerDelegate<Screen> {

package/android/src/main/java/com/swmansion/rnscreens/ScreenWindowTraits.kt

@@ -48,7 +48,7 @@ object ScreenWindowTraits {
 
     @SuppressLint("ObsoleteSdkInt") // to be removed when support for < 0.64 is dropped
     internal fun setColor(screen: Screen, activity: Activity?, context: ReactContext?) {
-        if (activity == null || context == null || Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) {
+        if (activity == null || context == null) {
             return
         }
         if (mDefaultStatusBarColor == null) {
@@ -112,8 +112,8 @@ object ScreenWindowTraits {
                     // and consume all the top insets so no padding will be added under the status bar.
                     val decorView = activity.window.decorView
                     if (translucent) {
-                        decorView.setOnApplyWindowInsetsListener { v, insets ->
-                            val defaultInsets = v.onApplyWindowInsets(insets)
+                        ViewCompat.setOnApplyWindowInsetsListener(decorView) { v, insets ->
+                            val defaultInsets = ViewCompat.onApplyWindowInsets(v, insets)
                             defaultInsets.replaceSystemWindowInsets(
                                 defaultInsets.systemWindowInsetLeft,
                                 0,
@@ -122,7 +122,7 @@ object ScreenWindowTraits {
                             )
                         }
                     } else {
-                        decorView.setOnApplyWindowInsetsListener(null)
+                        ViewCompat.setOnApplyWindowInsetsListener(decorView, null)
                     }
                     ViewCompat.requestApplyInsets(decorView)
                 }

package/android/src/paper/java/com/swmansion/rnscreens/FabricEnabledViewGroup.kt

@@ -2,15 +2,9 @@ package com.swmansion.rnscreens
 
 import android.view.ViewGroup
 import com.facebook.react.bridge.ReactContext
-import androidx.annotation.UiThread
-import com.facebook.react.uimanager.PixelUtil
-import com.facebook.react.bridge.ReadableMap
-import com.facebook.react.bridge.WritableMap
-import com.facebook.react.bridge.WritableNativeMap
-import kotlin.math.abs
 
 abstract class FabricEnabledViewGroup constructor(context: ReactContext?) : ViewGroup(context) {
-  protected fun updateScreenSizeFabric(width: Int, height: Int) {
-    // do nothing
-  }
-}
+    protected fun updateScreenSizeFabric(width: Int, height: Int) {
+        // do nothing
+    }
+}

package/ios/RNSScreen.h

@@ -103,6 +103,7 @@ NS_ASSUME_NONNULL_BEGIN
 #endif
 
 - (void)notifyTransitionProgress:(double)progress closing:(BOOL)closing goingForward:(BOOL)goingForward;
+- (BOOL)isModal;
 
 @end
 

package/ios/RNSScreen.mm

@@ -508,6 +508,11 @@
   }
 }
 
+- (BOOL)isModal
+{
+  return self.stackPresentation != RNSScreenStackPresentationPush;
+}
+
 #pragma mark - Fabric specific
 #ifdef RN_FABRIC_ENABLED
 
@@ -545,6 +550,17 @@
   _dismissed = NO;
   _state.reset();
   _touchHandler = nil;
+
+  // We set this prop to default value here to workaround view-recycling.
+  // Let's assume the view has had _stackPresentation == <some modal stack presentation> set
+  // before below line was executed. Then, when instantiated again (with the same modal presentation)
+  // updateProps:oldProps: method would be called and setter for stack presentation would not be called.
+  // This is crucial as in that setter we register `self.controller` as a delegate
+  // (UIAdaptivePresentationControllerDelegate) to presentation controller and this leads to buggy modal behaviour as we
+  // rely on UIAdaptivePresentationControllerDelegate callbacks. Restoring the default value and then comparing against
+  // it in updateProps:oldProps: allows for setter to be called, however if there was some additional logic to execute
+  // when stackPresentation is set to "push" the setter would not be triggered.
+  _stackPresentation = RNSScreenStackPresentationPush;
 }
 
 - (void)updateProps:(facebook::react::Props::Shared const &)props
@@ -598,9 +614,12 @@
   }
 #endif
 
-  if (newScreenProps.stackPresentation != oldScreenProps.stackPresentation) {
-    [self
-        setStackPresentation:[RNSConvert RNSScreenStackPresentationFromCppEquivalent:newScreenProps.stackPresentation]];
+  // Notice that we compare against _stackPresentation, not oldScreenProps.stackPresentation.
+  // See comment in prepareForRecycle method for explanation.
+  RNSScreenStackPresentation newStackPresentation =
+      [RNSConvert RNSScreenStackPresentationFromCppEquivalent:newScreenProps.stackPresentation];
+  if (newStackPresentation != _stackPresentation) {
+    [self setStackPresentation:newStackPresentation];
   }
 
   if (newScreenProps.stackAnimation != oldScreenProps.stackAnimation) {
@@ -739,7 +758,8 @@ Class<RCTComponentViewProtocol> RNSScreenCls(void)
 - (void)viewWillDisappear:(BOOL)animated
 {
   [super viewWillDisappear:animated];
-  if (!self.transitionCoordinator.isInteractive) {
+  // self.navigationController might be null when we are dismissing a modal
+  if (!self.transitionCoordinator.isInteractive && self.navigationController != nil) {
     // user might have long pressed ios 14 back button item,
     // so he can go back more than one screen and we need to dismiss more screens in JS stack then.
     // We check it by calculating the difference between the index of currently displayed screen
@@ -1038,18 +1058,17 @@ Class<RCTComponentViewProtocol> RNSScreenCls(void)
 {
   return self.screenView.homeIndicatorHidden;
 }
-
-- (int)getIndexOfView:(UIView *)view
-{
-  return (int)[[self.screenView.reactSuperview reactSubviews] indexOfObject:view];
-}
-
 - (int)getParentChildrenCount
 {
   return (int)[[self.screenView.reactSuperview reactSubviews] count];
 }
 #endif
 
+- (int)getIndexOfView:(UIView *)view
+{
+  return (int)[[self.screenView.reactSuperview reactSubviews] indexOfObject:view];
+}
+
 // since on Fabric the view of controller can be a snapshot of type `UIView`,
 // when we want to check props of ScreenView, we need to get them from _initialView
 - (RNSScreenView *)screenView

package/ios/RNSScreenStack.mm

@@ -598,22 +598,16 @@
 
 - (BOOL)gestureRecognizerShouldBegin:(UIGestureRecognizer *)gestureRecognizer
 {
-  RNSScreenView *topScreen = (RNSScreenView *)_controller.viewControllers.lastObject.view;
-
-  if (![topScreen isKindOfClass:[RNSScreenView class]] || !topScreen.gestureEnabled ||
-      _controller.viewControllers.count < 2) {
-    return NO;
-  }
+  RNSScreenView *topScreen = _reactSubviews.lastObject;
 
 #if TARGET_OS_TV
   [self cancelTouchesInParent];
   return YES;
 #else
-  if (topScreen.fullScreenSwipeEnabled) {
-    // we want only `RNSPanGestureRecognizer` to be able to recognize when
-    // `fullScreenSwipeEnabled` is set, and we are in the bounds set by user
-    if ([gestureRecognizer isKindOfClass:[RNSPanGestureRecognizer class]] &&
-        [self isInGestureResponseDistance:gestureRecognizer topScreen:topScreen]) {
+  // RNSPanGestureRecognizer will receive events iff topScreen.fullScreenSwipeEnabled == YES;
+  // Events are filtered in gestureRecognizer:shouldReceivePressOrTouchEvent: method
+  if ([gestureRecognizer isKindOfClass:[RNSPanGestureRecognizer class]]) {
+    if ([self isInGestureResponseDistance:gestureRecognizer topScreen:topScreen]) {
       _isFullWidthSwiping = YES;
       [self cancelTouchesInParent];
       return YES;
@@ -621,6 +615,7 @@
     return NO;
   }
 
+  // Now we're dealing with RNSScreenEdgeGestureRecognizer (or _UIParallaxTransitionPanGestureRecognizer)
   if (topScreen.customAnimationOnSwipe && [RNSScreenStackAnimator isCustomAnimation:topScreen.stackAnimation]) {
     if ([gestureRecognizer isKindOfClass:[RNSScreenEdgeGestureRecognizer class]]) {
       // if we do not set any explicit `semanticContentAttribute`, it is `UISemanticContentAttributeUnspecified` instead
@@ -639,10 +634,8 @@
     if ([gestureRecognizer isKindOfClass:[RNSScreenEdgeGestureRecognizer class]]) {
       // it should only recognize with `customAnimationOnSwipe` set
       return NO;
-    } else if ([gestureRecognizer isKindOfClass:[RNSPanGestureRecognizer class]]) {
-      // it should only recognize with `fullScreenSwipeEnabled` set
-      return NO;
     }
+    // _UIParallaxTransitionPanGestureRecognizer (other...)
     [self cancelTouchesInParent];
     return YES;
   }
@@ -675,7 +668,7 @@
 
 - (void)handleSwipe:(UIPanGestureRecognizer *)gestureRecognizer
 {
-  RNSScreenView *topScreen = ((RNSScreen *)_controller.viewControllers.lastObject).screenView;
+  RNSScreenView *topScreen = _reactSubviews.lastObject;
   float translation;
   float velocity;
   float distance;
@@ -807,6 +800,8 @@
   return [super hitTest:point withEvent:event];
 }
 
+#if !TARGET_OS_TV
+
 - (BOOL)isScrollViewPanGestureRecognizer:(UIGestureRecognizer *)gestureRecognizer
 {
   // NOTE: This hack is required to restore native behavior of edge swipe (interactive pop gesture)
@@ -819,18 +814,66 @@
   return scrollView.panGestureRecognizer == gestureRecognizer;
 }
 
+// Custom method for compatibility with iOS < 13.4
+// RNSScreenStackView is a UIGestureRecognizerDelegate for three types of gesture recognizers:
+// RNSPanGestureRecognizer, RNSScreenEdgeGestureRecognizer, _UIParallaxTransitionPanGestureRecognizer
+// Be careful when adding another type of gesture recognizer.
+- (BOOL)gestureRecognizer:(UIGestureRecognizer *)gestureRecognizer shouldReceivePressOrTouchEvent:(NSObject *)event
+{
+  RNSScreenView *topScreen = _reactSubviews.lastObject;
+
+  if (![topScreen isKindOfClass:[RNSScreenView class]] || !topScreen.gestureEnabled ||
+      _controller.viewControllers.count < 2 || [topScreen isModal]) {
+    return NO;
+  }
+
+  // We want to pass events to RNSPanGestureRecognizer iff full screen swipe is enabled.
+  if ([gestureRecognizer isKindOfClass:[RNSPanGestureRecognizer class]]) {
+    return topScreen.fullScreenSwipeEnabled;
+  }
+
+  // RNSScreenEdgeGestureRecognizer || _UIParallaxTransitionPanGestureRecognizer
+  return YES;
+}
+
+- (BOOL)gestureRecognizer:(UIGestureRecognizer *)gestureRecognizer shouldReceivePress:(UIPress *)press;
+{
+  return [self gestureRecognizer:gestureRecognizer shouldReceivePressOrTouchEvent:press];
+}
+
+- (BOOL)gestureRecognizer:(UIGestureRecognizer *)gestureRecognizer shouldReceiveTouch:(UITouch *)touch;
+{
+  return [self gestureRecognizer:gestureRecognizer shouldReceivePressOrTouchEvent:touch];
+}
+
 - (BOOL)gestureRecognizer:(UIGestureRecognizer *)gestureRecognizer
     shouldRecognizeSimultaneouslyWithGestureRecognizer:(UIGestureRecognizer *)otherGestureRecognizer
 {
-  return [self isScrollViewPanGestureRecognizer:otherGestureRecognizer];
+  if ([gestureRecognizer isKindOfClass:[RNSPanGestureRecognizer class]] &&
+      [self isScrollViewPanGestureRecognizer:otherGestureRecognizer]) {
+    RNSPanGestureRecognizer *panGestureRecognizer = (RNSPanGestureRecognizer *)gestureRecognizer;
+    BOOL isBackGesture = [panGestureRecognizer translationInView:panGestureRecognizer.view].x > 0 &&
+        _controller.viewControllers.count > 1;
+
+    if (gestureRecognizer.state == UIGestureRecognizerStateBegan || isBackGesture) {
+      return NO;
+    }
+
+    return YES;
+  }
+  return NO;
 }
 
 - (BOOL)gestureRecognizer:(UIGestureRecognizer *)gestureRecognizer
     shouldBeRequiredToFailByGestureRecognizer:(UIGestureRecognizer *)otherGestureRecognizer
 {
-  return [self isScrollViewPanGestureRecognizer:otherGestureRecognizer];
+  return (
+      [gestureRecognizer isKindOfClass:[UIScreenEdgePanGestureRecognizer class]] &&
+      [self isScrollViewPanGestureRecognizer:otherGestureRecognizer]);
 }
 
+#endif // !TARGET_OS_TV
+
 - (void)insertReactSubview:(RNSScreenView *)subview atIndex:(NSInteger)atIndex
 {
   if (![subview isKindOfClass:[RNSScreenView class]]) {
@@ -926,7 +969,7 @@
 - (void)mountingTransactionWillMount:(facebook::react::MountingTransaction const &)transaction
                 withSurfaceTelemetry:(facebook::react::SurfaceTelemetry const &)surfaceTelemetry
 {
-  for (auto mutation : transaction.getMutations()) {
+  for (auto &mutation : transaction.getMutations()) {
     if (mutation.type == facebook::react::ShadowViewMutation::Type::Remove &&
         mutation.parentShadowView.componentName != nil &&
         strcmp(mutation.parentShadowView.componentName, "RNSScreenStack") == 0) {