react-native-screens 4.0.0-beta.9 → 4.1.0

package/android/src/main/jni/CMakeLists.txt

@@ -38,25 +38,34 @@ target_include_directories(
   ${LIB_ANDROID_GENERATED_COMPONENTS_DIR}
 )
 
-target_link_libraries(
-  ${LIB_TARGET_NAME}
-  fbjni
-  folly_runtime
-  glog
-  jsi
-  react_codegen_rncore
-  react_debug
-  react_nativemodule_core
-  react_render_core
-  react_render_debug
-  react_render_graphics
-  react_render_mapbuffer
-  react_render_componentregistry
-  react_utils
-  rrc_view
-  turbomodulejsijni
-  yoga
-)
+if(ReactAndroid_VERSION_MINOR GREATER_EQUAL 76)
+  target_link_libraries(
+    ${LIB_TARGET_NAME}
+    ReactAndroid::reactnative
+    ReactAndroid::jsi
+    fbjni::fbjni
+  )
+else()
+  target_link_libraries(
+    ${LIB_TARGET_NAME}
+    fbjni
+    folly_runtime
+    glog
+    jsi
+    react_codegen_rncore
+    react_debug
+    react_nativemodule_core
+    react_render_core
+    react_render_debug
+    react_render_graphics
+    react_render_mapbuffer
+    react_render_componentregistry
+    react_utils
+    rrc_view
+    turbomodulejsijni
+    yoga
+  )
+endif()
 
 target_compile_options(
   ${LIB_TARGET_NAME}

package/android/src/paper/java/com/facebook/react/viewmanagers/RNSScreenManagerDelegate.java

@@ -52,7 +52,7 @@ public class RNSScreenManagerDelegate<T extends View, U extends BaseViewManagerI
         mViewManager.setFullScreenSwipeEnabled(view, value == null ? false : (boolean) value);
         break;
       case "fullScreenSwipeShadowEnabled":
-        mViewManager.setFullScreenSwipeShadowEnabled(view, value == null ? false : (boolean) value);
+        mViewManager.setFullScreenSwipeShadowEnabled(view, value == null ? true : (boolean) value);
         break;
       case "homeIndicatorHidden":
         mViewManager.setHomeIndicatorHidden(view, value == null ? false : (boolean) value);
@@ -91,7 +91,7 @@ public class RNSScreenManagerDelegate<T extends View, U extends BaseViewManagerI
         mViewManager.setStackAnimation(view, (String) value);
         break;
       case "transitionDuration":
-        mViewManager.setTransitionDuration(view, value == null ? 350 : ((Double) value).intValue());
+        mViewManager.setTransitionDuration(view, value == null ? 500 : ((Double) value).intValue());
         break;
       case "replaceAnimation":
         mViewManager.setReplaceAnimation(view, (String) value);

package/common/cpp/react/renderer/components/rnscreens/RNSScreenShadowNode.cpp

@@ -26,10 +26,10 @@ findHeaderConfigChild(const YogaLayoutableShadowNode &screenShadowNode) {
   return {};
 }
 
+#ifdef ANDROID
 static constexpr const char *kScreenDummyLayoutHelperClass =
     "com/swmansion/rnscreens/utils/ScreenDummyLayoutHelper";
 
-#ifdef ANDROID
 std::optional<float> findHeaderHeight(
     const int fontSize,
     const bool isTitleEmpty) {

package/ios/RNSConvert.h

@@ -1,12 +1,17 @@
-#ifdef RCT_NEW_ARCH_ENABLED
 #import <UIKit/UIKit.h>
+#ifdef RCT_NEW_ARCH_ENABLED
 #import <react/renderer/components/rnscreens/Props.h>
+#endif // RCT_NEW_ARCH_ENABLED
 #import "RNSEnums.h"
 
+#ifdef RCT_NEW_ARCH_ENABLED
 namespace react = facebook::react;
+#endif // RCT_NEW_ARCH_ENABLED
 
 @interface RNSConvert : NSObject
 
+#ifdef RCT_NEW_ARCH_ENABLED
+
 + (UISemanticContentAttribute)UISemanticContentAttributeFromCppEquivalent:
     (react::RNSScreenStackHeaderConfigDirection)direction;
 
@@ -38,12 +43,14 @@ namespace react = facebook::react;
 
 + (RNSSearchBarPlacement)RNSScreenSearchBarPlacementFromCppEquivalent:(react::RNSSearchBarPlacement)placement;
 
-+ (NSMutableArray<NSNumber *> *)NSNumberMutableArrayFromFloatVector:(const std::vector<CGFloat> &)vector;
-
 + (NSMutableArray<NSNumber *> *)arrayFromVector:(const std::vector<CGFloat> &)vector;
 
-+ (UIBlurEffectStyle)UIBlurEffectStyleFromCppEquivalent:(react::RNSScreenStackHeaderConfigBlurEffect)blurEffect;
-
-@end
++ (RNSBlurEffectStyle)RNSBlurEffectStyleFromCppEquivalent:(react::RNSScreenStackHeaderConfigBlurEffect)blurEffect;
 
 #endif // RCT_NEW_ARCH_ENABLED
+
+/// This method fails (by assertion) when `blurEffect == RNSBlurEffectStyleNone` which has no counter part in the UIKit
+/// type.
++ (UIBlurEffectStyle)tryConvertRNSBlurEffectStyleToUIBlurEffectStyle:(RNSBlurEffectStyle)blurEffect;
+
+@end

package/ios/RNSConvert.mm

@@ -1,15 +1,21 @@
 #import "RNSConvert.h"
 
-#ifdef RCT_NEW_ARCH_ENABLED
+#ifndef RCT_NEW_ARCH_ENABLED
+#import <React/RCTAssert.h>
+#endif // !RCT_NEW_ARCH_ENABLED
+
 @implementation RNSConvert
 
+#ifdef RCT_NEW_ARCH_ENABLED
 + (UISemanticContentAttribute)UISemanticContentAttributeFromCppEquivalent:
     (react::RNSScreenStackHeaderConfigDirection)direction
 {
   switch (direction) {
-    case react::RNSScreenStackHeaderConfigDirection::Rtl:
+    using enum react::RNSScreenStackHeaderConfigDirection;
+
+    case Rtl:
       return UISemanticContentAttributeForceRightToLeft;
-    case react::RNSScreenStackHeaderConfigDirection::Ltr:
+    case Ltr:
       return UISemanticContentAttributeForceLeftToRight;
   }
 }
@@ -18,11 +24,13 @@
     (react::RNSScreenStackHeaderConfigBackButtonDisplayMode)backButtonDisplayMode
 {
   switch (backButtonDisplayMode) {
-    case react::RNSScreenStackHeaderConfigBackButtonDisplayMode::Default:
+    using enum react::RNSScreenStackHeaderConfigBackButtonDisplayMode;
+
+    case Default:
       return UINavigationItemBackButtonDisplayModeDefault;
-    case react::RNSScreenStackHeaderConfigBackButtonDisplayMode::Generic:
+    case Generic:
       return UINavigationItemBackButtonDisplayModeGeneric;
-    case react::RNSScreenStackHeaderConfigBackButtonDisplayMode::Minimal:
+    case Minimal:
       return UINavigationItemBackButtonDisplayModeMinimal;
   }
 }
@@ -31,19 +39,21 @@
     (react::RNSScreenStackPresentation)stackPresentation
 {
   switch (stackPresentation) {
-    case react::RNSScreenStackPresentation::Push:
+    using enum react::RNSScreenStackPresentation;
+
+    case Push:
       return RNSScreenStackPresentationPush;
-    case react::RNSScreenStackPresentation::Modal:
+    case Modal:
       return RNSScreenStackPresentationModal;
-    case react::RNSScreenStackPresentation::FullScreenModal:
+    case FullScreenModal:
       return RNSScreenStackPresentationFullScreenModal;
-    case react::RNSScreenStackPresentation::FormSheet:
+    case FormSheet:
       return RNSScreenStackPresentationFormSheet;
-    case react::RNSScreenStackPresentation::ContainedModal:
+    case ContainedModal:
       return RNSScreenStackPresentationContainedModal;
-    case react::RNSScreenStackPresentation::TransparentModal:
+    case TransparentModal:
       return RNSScreenStackPresentationTransparentModal;
-    case react::RNSScreenStackPresentation::ContainedTransparentModal:
+    case ContainedTransparentModal:
       return RNSScreenStackPresentationContainedTransparentModal;
   }
 }
@@ -51,26 +61,27 @@
 + (RNSScreenStackAnimation)RNSScreenStackAnimationFromCppEquivalent:(react::RNSScreenStackAnimation)stackAnimation
 {
   switch (stackAnimation) {
-    // these four are intentionally grouped
-    case react::RNSScreenStackAnimation::Slide_from_right:
-    case react::RNSScreenStackAnimation::Ios_from_right:
-    case react::RNSScreenStackAnimation::Default:
+    using enum react::RNSScreenStackAnimation;
+    // these three are intentionally grouped
+    case Slide_from_right:
+    case Ios_from_right:
+    case Default:
       return RNSScreenStackAnimationDefault;
     // these two are intentionally grouped
-    case react::RNSScreenStackAnimation::Slide_from_left:
-    case react::RNSScreenStackAnimation::Ios_from_left:
+    case Slide_from_left:
+    case Ios_from_left:
       return RNSScreenStackAnimationSlideFromLeft;
-    case react::RNSScreenStackAnimation::Flip:
+    case Flip:
       return RNSScreenStackAnimationFlip;
-    case react::RNSScreenStackAnimation::Simple_push:
+    case Simple_push:
       return RNSScreenStackAnimationSimplePush;
-    case react::RNSScreenStackAnimation::None:
+    case None:
       return RNSScreenStackAnimationNone;
-    case react::RNSScreenStackAnimation::Fade:
+    case Fade:
       return RNSScreenStackAnimationFade;
-    case react::RNSScreenStackAnimation::Slide_from_bottom:
+    case Slide_from_bottom:
       return RNSScreenStackAnimationSlideFromBottom;
-    case react::RNSScreenStackAnimation::Fade_from_bottom:
+    case Fade_from_bottom:
       return RNSScreenStackAnimationFadeFromBottom;
   }
 }
@@ -79,17 +90,19 @@
     (react::RNSScreenStackHeaderSubviewType)subviewType
 {
   switch (subviewType) {
-    case react::RNSScreenStackHeaderSubviewType::Left:
+    using enum react::RNSScreenStackHeaderSubviewType;
+
+    case Left:
       return RNSScreenStackHeaderSubviewTypeLeft;
-    case react::RNSScreenStackHeaderSubviewType::Right:
+    case Right:
       return RNSScreenStackHeaderSubviewTypeRight;
-    case react::RNSScreenStackHeaderSubviewType::Title:
+    case Title:
       return RNSScreenStackHeaderSubviewTypeTitle;
-    case react::RNSScreenStackHeaderSubviewType::Center:
+    case Center:
       return RNSScreenStackHeaderSubviewTypeCenter;
-    case react::RNSScreenStackHeaderSubviewType::SearchBar:
+    case SearchBar:
       return RNSScreenStackHeaderSubviewTypeSearchBar;
-    case react::RNSScreenStackHeaderSubviewType::Back:
+    case Back:
       return RNSScreenStackHeaderSubviewTypeBackButton;
   }
 }
@@ -98,9 +111,10 @@
     (react::RNSScreenReplaceAnimation)replaceAnimation
 {
   switch (replaceAnimation) {
-    case react::RNSScreenReplaceAnimation::Pop:
+    using enum react::RNSScreenReplaceAnimation;
+    case Pop:
       return RNSScreenReplaceAnimationPop;
-    case react::RNSScreenReplaceAnimation::Push:
+    case Push:
       return RNSScreenReplaceAnimationPush;
   }
 }
@@ -108,9 +122,10 @@
 + (RNSScreenSwipeDirection)RNSScreenSwipeDirectionFromCppEquivalent:(react::RNSScreenSwipeDirection)swipeDirection
 {
   switch (swipeDirection) {
-    case react::RNSScreenSwipeDirection::Horizontal:
+    using enum react::RNSScreenSwipeDirection;
+    case Horizontal:
       return RNSScreenSwipeDirectionHorizontal;
-    case react::RNSScreenSwipeDirection::Vertical:
+    case Vertical:
       return RNSScreenSwipeDirectionVertical;
   }
 }
@@ -140,13 +155,14 @@
     (react::RNSSearchBarAutoCapitalize)autoCapitalize
 {
   switch (autoCapitalize) {
-    case react::RNSSearchBarAutoCapitalize::Words:
+    using enum react::RNSSearchBarAutoCapitalize;
+    case Words:
       return UITextAutocapitalizationTypeWords;
-    case react::RNSSearchBarAutoCapitalize::Sentences:
+    case Sentences:
       return UITextAutocapitalizationTypeSentences;
-    case react::RNSSearchBarAutoCapitalize::Characters:
+    case Characters:
       return UITextAutocapitalizationTypeAllCharacters;
-    case react::RNSSearchBarAutoCapitalize::None:
+    case None:
       return UITextAutocapitalizationTypeNone;
   }
 }
@@ -155,11 +171,12 @@
 + (RNSSearchBarPlacement)RNSScreenSearchBarPlacementFromCppEquivalent:(react::RNSSearchBarPlacement)placement
 {
   switch (placement) {
-    case react::RNSSearchBarPlacement::Stacked:
+    using enum react::RNSSearchBarPlacement;
+    case Stacked:
       return RNSSearchBarPlacementStacked;
-    case react::RNSSearchBarPlacement::Automatic:
+    case Automatic:
       return RNSSearchBarPlacementAutomatic;
-    case react::RNSSearchBarPlacement::Inline:
+    case Inline:
       return RNSSearchBarPlacementInline;
   }
 }
@@ -173,71 +190,90 @@
   return array;
 }
 
-+ (UIBlurEffectStyle)UIBlurEffectStyleFromCppEquivalent:(react::RNSScreenStackHeaderConfigBlurEffect)blurEffect
++ (RNSBlurEffectStyle)RNSBlurEffectStyleFromCppEquivalent:(react::RNSScreenStackHeaderConfigBlurEffect)blurEffect
 {
+  using enum react::RNSScreenStackHeaderConfigBlurEffect;
 #if !TARGET_OS_TV && defined(__IPHONE_OS_VERSION_MAX_ALLOWED) && defined(__IPHONE_13_0) && \
     __IPHONE_OS_VERSION_MAX_ALLOWED >= __IPHONE_13_0
   if (@available(iOS 13.0, *)) {
     switch (blurEffect) {
-      case react::RNSScreenStackHeaderConfigBlurEffect::ExtraLight:
-        return UIBlurEffectStyleExtraLight;
-      case react::RNSScreenStackHeaderConfigBlurEffect::Light:
-        return UIBlurEffectStyleLight;
-      case react::RNSScreenStackHeaderConfigBlurEffect::Dark:
-        return UIBlurEffectStyleDark;
-      case react::RNSScreenStackHeaderConfigBlurEffect::Regular:
-        return UIBlurEffectStyleRegular;
-      case react::RNSScreenStackHeaderConfigBlurEffect::Prominent:
-        return UIBlurEffectStyleProminent;
-      case react::RNSScreenStackHeaderConfigBlurEffect::SystemUltraThinMaterial:
-        return UIBlurEffectStyleSystemUltraThinMaterial;
-      case react::RNSScreenStackHeaderConfigBlurEffect::SystemThinMaterial:
-        return UIBlurEffectStyleSystemThinMaterial;
-      case react::RNSScreenStackHeaderConfigBlurEffect::SystemMaterial:
-        return UIBlurEffectStyleSystemMaterial;
-      case react::RNSScreenStackHeaderConfigBlurEffect::SystemThickMaterial:
-        return UIBlurEffectStyleSystemThickMaterial;
-      case react::RNSScreenStackHeaderConfigBlurEffect::SystemChromeMaterial:
-        return UIBlurEffectStyleSystemChromeMaterial;
-      case react::RNSScreenStackHeaderConfigBlurEffect::SystemUltraThinMaterialLight:
-        return UIBlurEffectStyleSystemUltraThinMaterialLight;
-      case react::RNSScreenStackHeaderConfigBlurEffect::SystemThinMaterialLight:
-        return UIBlurEffectStyleSystemThinMaterialLight;
-      case react::RNSScreenStackHeaderConfigBlurEffect::SystemMaterialLight:
-        return UIBlurEffectStyleSystemMaterialLight;
-      case react::RNSScreenStackHeaderConfigBlurEffect::SystemThickMaterialLight:
-        return UIBlurEffectStyleSystemThickMaterialLight;
-      case react::RNSScreenStackHeaderConfigBlurEffect::SystemChromeMaterialLight:
-        return UIBlurEffectStyleSystemChromeMaterialLight;
-      case react::RNSScreenStackHeaderConfigBlurEffect::SystemUltraThinMaterialDark:
-        return UIBlurEffectStyleSystemUltraThinMaterialDark;
-      case react::RNSScreenStackHeaderConfigBlurEffect::SystemThinMaterialDark:
-        return UIBlurEffectStyleSystemThinMaterialDark;
-      case react::RNSScreenStackHeaderConfigBlurEffect::SystemMaterialDark:
-        return UIBlurEffectStyleSystemMaterialDark;
-      case react::RNSScreenStackHeaderConfigBlurEffect::SystemThickMaterialDark:
-        return UIBlurEffectStyleSystemThickMaterialDark;
-      case react::RNSScreenStackHeaderConfigBlurEffect::SystemChromeMaterialDark:
-        return UIBlurEffectStyleSystemChromeMaterialDark;
+      case None:
+        return RNSBlurEffectStyleNone;
+      case ExtraLight:
+        return RNSBlurEffectStyleExtraLight;
+      case Light:
+        return RNSBlurEffectStyleLight;
+      case Dark:
+        return RNSBlurEffectStyleDark;
+      case Regular:
+        return RNSBlurEffectStyleRegular;
+      case Prominent:
+        return RNSBlurEffectStyleProminent;
+      case SystemUltraThinMaterial:
+        return RNSBlurEffectStyleSystemUltraThinMaterial;
+      case SystemThinMaterial:
+        return RNSBlurEffectStyleSystemThinMaterial;
+      case SystemMaterial:
+        return RNSBlurEffectStyleSystemMaterial;
+      case SystemThickMaterial:
+        return RNSBlurEffectStyleSystemThickMaterial;
+      case SystemChromeMaterial:
+        return RNSBlurEffectStyleSystemChromeMaterial;
+      case SystemUltraThinMaterialLight:
+        return RNSBlurEffectStyleSystemUltraThinMaterialLight;
+      case SystemThinMaterialLight:
+        return RNSBlurEffectStyleSystemThinMaterialLight;
+      case SystemMaterialLight:
+        return RNSBlurEffectStyleSystemMaterialLight;
+      case SystemThickMaterialLight:
+        return RNSBlurEffectStyleSystemThickMaterialLight;
+      case SystemChromeMaterialLight:
+        return RNSBlurEffectStyleSystemChromeMaterialLight;
+      case SystemUltraThinMaterialDark:
+        return RNSBlurEffectStyleSystemUltraThinMaterialDark;
+      case SystemThinMaterialDark:
+        return RNSBlurEffectStyleSystemThinMaterialDark;
+      case SystemMaterialDark:
+        return RNSBlurEffectStyleSystemMaterialDark;
+      case SystemThickMaterialDark:
+        return RNSBlurEffectStyleSystemThickMaterialDark;
+      case SystemChromeMaterialDark:
+        return RNSBlurEffectStyleSystemChromeMaterialDark;
     }
   }
 #endif
 
   switch (blurEffect) {
-    case react::RNSScreenStackHeaderConfigBlurEffect::Light:
-      return UIBlurEffectStyleLight;
-    case react::RNSScreenStackHeaderConfigBlurEffect::Dark:
-      return UIBlurEffectStyleDark;
-    case react::RNSScreenStackHeaderConfigBlurEffect::Regular:
-      return UIBlurEffectStyleRegular;
-    case react::RNSScreenStackHeaderConfigBlurEffect::Prominent:
-      return UIBlurEffectStyleProminent;
-    case react::RNSScreenStackHeaderConfigBlurEffect::ExtraLight:
+    case None:
+      return RNSBlurEffectStyleNone;
+    case Light:
+      return RNSBlurEffectStyleLight;
+    case Dark:
+      return RNSBlurEffectStyleDark;
+    case Regular:
+      return RNSBlurEffectStyleRegular;
+    case Prominent:
+      return RNSBlurEffectStyleProminent;
+    case ExtraLight:
     default:
-      return UIBlurEffectStyleExtraLight;
+      return RNSBlurEffectStyleNone;
   }
 }
 
-@end
+#endif // RCT_NEW_ARCH_ENABLED
 
++ (UIBlurEffectStyle)tryConvertRNSBlurEffectStyleToUIBlurEffectStyle:(RNSBlurEffectStyle)blurEffect
+{
+#ifdef RCT_NEW_ARCH_ENABLED
+  react_native_assert(blurEffect != RNSBlurEffectStyleNone);
+#else
+  RCTAssert(
+      blurEffect != RNSBlurEffectStyleNone, @"RNSBlurEffectStyleNone variant is not convertible to UIBlurEffectStyle");
 #endif // RCT_NEW_ARCH_ENABLED
+
+  // Cast safety: RNSBlurEffectStyle is defined in such way that its values map 1:1 with
+  // UIBlurEffectStyle, except RNSBlurEffectStyleNone which is excluded above.
+  return (UIBlurEffectStyle)blurEffect;
+}
+
+@end

package/ios/RNSEnums.h

@@ -30,6 +30,7 @@ typedef NS_ENUM(NSInteger, RNSScreenSwipeDirection) {
 };
 
 typedef NS_ENUM(NSInteger, RNSActivityState) {
+  RNSActivityStateUndefined = -1,
   RNSActivityStateInactive = 0,
   RNSActivityStateTransitioningOrBelowTop = 1,
   RNSActivityStateOnTop = 2
@@ -70,3 +71,49 @@ typedef NS_ENUM(NSInteger, RNSSearchBarPlacement) {
   RNSSearchBarPlacementInline,
   RNSSearchBarPlacementStacked,
 };
+
+// Redefinition of UIBlurEffectStyle. We need to represent additional case of `None`.
+typedef NS_ENUM(NSInteger, RNSBlurEffectStyle) {
+  /// No blur effect should be visible
+  RNSBlurEffectStyleNone = -1,
+  RNSBlurEffectStyleExtraLight = UIBlurEffectStyleExtraLight,
+  RNSBlurEffectStyleLight = UIBlurEffectStyleLight,
+  RNSBlurEffectStyleDark = UIBlurEffectStyleDark,
+  // TODO: Add support for this variant on tvOS
+  //  RNSBlurEffectStyleExtraDark = UIBlurEffectStyleExtraDark API_AVAILABLE(tvos(10.0)) API_UNAVAILABLE(ios)
+  //  API_UNAVAILABLE(watchos),
+  RNSBlurEffectStyleRegular API_AVAILABLE(ios(10.0)) API_UNAVAILABLE(watchos) = UIBlurEffectStyleRegular,
+  RNSBlurEffectStyleProminent API_AVAILABLE(ios(10.0)) API_UNAVAILABLE(watchos) = UIBlurEffectStyleProminent,
+  RNSBlurEffectStyleSystemUltraThinMaterial API_AVAILABLE(ios(13.0))
+      API_UNAVAILABLE(watchos, tvos) = UIBlurEffectStyleSystemUltraThinMaterial,
+  RNSBlurEffectStyleSystemThinMaterial API_AVAILABLE(ios(13.0))
+      API_UNAVAILABLE(watchos, tvos) = UIBlurEffectStyleSystemThinMaterial,
+  RNSBlurEffectStyleSystemMaterial API_AVAILABLE(ios(13.0))
+      API_UNAVAILABLE(watchos, tvos) = UIBlurEffectStyleSystemMaterial,
+  RNSBlurEffectStyleSystemThickMaterial API_AVAILABLE(ios(13.0))
+      API_UNAVAILABLE(watchos, tvos) = UIBlurEffectStyleSystemThickMaterial,
+  RNSBlurEffectStyleSystemChromeMaterial API_AVAILABLE(ios(13.0))
+      API_UNAVAILABLE(watchos, tvos) = UIBlurEffectStyleSystemChromeMaterial,
+  RNSBlurEffectStyleSystemUltraThinMaterialLight API_AVAILABLE(ios(13.0))
+      API_UNAVAILABLE(watchos, tvos) = UIBlurEffectStyleSystemUltraThinMaterialLight,
+  RNSBlurEffectStyleSystemThinMaterialLight API_AVAILABLE(ios(13.0))
+      API_UNAVAILABLE(watchos, tvos) = UIBlurEffectStyleSystemThinMaterialLight,
+  RNSBlurEffectStyleSystemMaterialLight API_AVAILABLE(ios(13.0))
+      API_UNAVAILABLE(watchos, tvos) = UIBlurEffectStyleSystemMaterialLight,
+  RNSBlurEffectStyleSystemThickMaterialLight API_AVAILABLE(ios(13.0))
+      API_UNAVAILABLE(watchos, tvos) = UIBlurEffectStyleSystemThickMaterialLight,
+  RNSBlurEffectStyleSystemChromeMaterialLight API_AVAILABLE(ios(13.0))
+      API_UNAVAILABLE(watchos, tvos) = UIBlurEffectStyleSystemChromeMaterialLight,
+
+  RNSBlurEffectStyleSystemUltraThinMaterialDark API_AVAILABLE(ios(13.0))
+      API_UNAVAILABLE(watchos, tvos) = UIBlurEffectStyleSystemUltraThinMaterialDark,
+  RNSBlurEffectStyleSystemThinMaterialDark API_AVAILABLE(ios(13.0))
+      API_UNAVAILABLE(watchos, tvos) = UIBlurEffectStyleSystemThinMaterialDark,
+  RNSBlurEffectStyleSystemMaterialDark API_AVAILABLE(ios(13.0))
+      API_UNAVAILABLE(watchos, tvos) = UIBlurEffectStyleSystemMaterialDark,
+  RNSBlurEffectStyleSystemThickMaterialDark API_AVAILABLE(ios(13.0))
+      API_UNAVAILABLE(watchos, tvos) = UIBlurEffectStyleSystemThickMaterialDark,
+  RNSBlurEffectStyleSystemChromeMaterialDark API_AVAILABLE(ios(13.0))
+      API_UNAVAILABLE(watchos, tvos) = UIBlurEffectStyleSystemChromeMaterialDark
+
+} API_AVAILABLE(ios(8.0)) API_UNAVAILABLE(watchos);

package/ios/RNSFullWindowOverlay.mm

@@ -1,5 +1,6 @@
 #import <UIKit/UIKit.h>
 
+#import "RNSDefines.h"
 #import "RNSFullWindowOverlay.h"
 
 #ifdef RCT_NEW_ARCH_ENABLED
@@ -198,6 +199,8 @@
   [childComponentView removeFromSuperview];
 }
 
+RNS_IGNORE_SUPER_CALL_BEGIN
+// We do not set frame for ouselves, but rather for the container.
 - (void)updateLayoutMetrics:(react::LayoutMetrics const &)layoutMetrics
            oldLayoutMetrics:(react::LayoutMetrics const &)oldLayoutMetrics
 {
@@ -205,6 +208,7 @@
   _reactFrame = frame;
   [_container setFrame:frame];
 }
+RNS_IGNORE_SUPER_CALL_END
 
 #else
 #pragma mark - Paper specific

package/ios/RNSPercentDrivenInteractiveTransition.h

@@ -0,0 +1,12 @@
+#import <UIKit/UIKit.h>
+#import "RNSScreenStackAnimator.h"
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface RNSPercentDrivenInteractiveTransition : UIPercentDrivenInteractiveTransition
+
+@property (nonatomic, nullable) RNSScreenStackAnimator *animationController;
+
+@end
+
+NS_ASSUME_NONNULL_END

package/ios/RNSPercentDrivenInteractiveTransition.mm

@@ -0,0 +1,69 @@
+#import "RNSPercentDrivenInteractiveTransition.h"
+
+@implementation RNSPercentDrivenInteractiveTransition {
+  RNSScreenStackAnimator *_animationController;
+}
+
+#pragma mark - UIViewControllerInteractiveTransitioning
+
+- (void)startInteractiveTransition:(id<UIViewControllerContextTransitioning>)transitionContext
+{
+  [super startInteractiveTransition:transitionContext];
+}
+
+#pragma mark - UIPercentDrivenInteractiveTransition
+
+// `updateInteractiveTransition`, `finishInteractiveTransition`,
+// `cancelInteractiveTransition` are forwared by superclass to
+// corresponding methods in transition context. In case
+// of "classical CA driven animations", such as UIView animation blocks
+// or direct utilization of CoreAnimation API, context drives the animation,
+// however in case of UIViewPropertyAnimator it does not. We need
+// to drive animation manually and this is exactly what happens below.
+
+- (void)updateInteractiveTransition:(CGFloat)percentComplete
+{
+  if (_animationController != nil) {
+    [_animationController.inFlightAnimator setFractionComplete:percentComplete];
+  }
+  [super updateInteractiveTransition:percentComplete];
+}
+
+- (void)finishInteractiveTransition
+{
+  [self finalizeInteractiveTransitionWithAnimationWasCancelled:NO];
+  [super finishInteractiveTransition];
+}
+
+- (void)cancelInteractiveTransition
+{
+  [self finalizeInteractiveTransitionWithAnimationWasCancelled:YES];
+  [super cancelInteractiveTransition];
+}
+
+#pragma mark - Helpers
+
+- (void)finalizeInteractiveTransitionWithAnimationWasCancelled:(BOOL)cancelled
+{
+  if (_animationController == nil) {
+    return;
+  }
+
+  UIViewPropertyAnimator *_Nullable animator = _animationController.inFlightAnimator;
+  if (animator == nil) {
+    return;
+  }
+
+  BOOL shouldReverseAnimation = cancelled;
+
+  id<UITimingCurveProvider> timingParams = [_animationController timingParamsForAnimationCompletion];
+
+  [animator pauseAnimation];
+  [animator setReversed:shouldReverseAnimation];
+  [animator continueAnimationWithTimingParameters:timingParams durationFactor:(1 - animator.fractionComplete)];
+
+  // System retains it & we don't need it anymore.
+  _animationController = nil;
+}
+
+@end

package/ios/RNSScreen.h

@@ -100,6 +100,8 @@ namespace react = facebook::react;
 @property (nonatomic) react::LayoutMetrics newLayoutMetrics;
 @property (weak, nonatomic) RNSScreenStackHeaderConfig *config;
 @property (nonatomic, readonly) BOOL hasHeaderConfig;
+@property (nonatomic, readonly, getter=isMarkedForUnmountInCurrentTransaction)
+    BOOL markedForUnmountInCurrentTransaction;
 #else
 @property (nonatomic, copy) RCTDirectEventBlock onAppear;
 @property (nonatomic, copy) RCTDirectEventBlock onDisappear;
@@ -124,6 +126,10 @@ namespace react = facebook::react;
 - (void)updateBounds;
 - (void)notifyDismissedWithCount:(int)dismissCount;
 - (instancetype)initWithFrame:(CGRect)frame;
+/// Tell `Screen` that it will be unmounted in next transaction.
+/// The component needs this so that we can later decide whether to
+/// replace it with snapshot or not.
+- (void)willBeUnmountedInUpcomingTransaction;
 #else
 - (instancetype)initWithBridge:(RCTBridge *)bridge;
 #endif // RCT_NEW_ARCH_ENABLED
@@ -133,6 +139,14 @@ namespace react = facebook::react;
 - (BOOL)isModal;
 - (BOOL)isPresentedAsNativeModal;
 
+/**
+ * Tell `Screen` component that it has been removed from react state and can safely cleanup
+ * any retained resources.
+ *
+ * Note, that on old architecture this method might be called by RN via `RCTInvalidating` protocol.
+ */
+- (void)invalidate;
+
 /// Looks for header configuration in instance's `reactSubviews` and returns it. If not present returns `nil`.
 - (RNSScreenStackHeaderConfig *_Nullable)findHeaderConfig;