react-native-screens 4.11.0-beta.0 → 4.11.0-beta.2

package/android/src/main/java/com/swmansion/rnscreens/stack/views/ScreensCoordinatorLayout.kt

@@ -0,0 +1,99 @@
+package com.swmansion.rnscreens.stack.views
+
+import android.content.Context
+import android.view.WindowInsets
+import android.view.animation.Animation
+import android.view.animation.AnimationSet
+import androidx.coordinatorlayout.widget.CoordinatorLayout
+import com.facebook.react.uimanager.ReactPointerEventsView
+import com.swmansion.rnscreens.PointerEventsBoxNoneImpl
+import com.swmansion.rnscreens.ScreenStackFragment
+import com.swmansion.rnscreens.bottomsheet.usesFormSheetPresentation
+import com.swmansion.rnscreens.stack.anim.ScreensAnimation
+
+internal class ScreensCoordinatorLayout(
+    context: Context,
+    internal val fragment: ScreenStackFragment,
+    private val pointerEventsImpl: ReactPointerEventsView,
+) : CoordinatorLayout(context),
+    ReactPointerEventsView by pointerEventsImpl {
+    constructor(context: Context, fragment: ScreenStackFragment) : this(
+        context,
+        fragment,
+        PointerEventsBoxNoneImpl(),
+    )
+
+    override fun onApplyWindowInsets(insets: WindowInsets?): WindowInsets = super.onApplyWindowInsets(insets)
+
+    private val animationListener: Animation.AnimationListener =
+        object : Animation.AnimationListener {
+            override fun onAnimationStart(animation: Animation) {
+                fragment.onViewAnimationStart()
+            }
+
+            override fun onAnimationEnd(animation: Animation) {
+                fragment.onViewAnimationEnd()
+            }
+
+            override fun onAnimationRepeat(animation: Animation) {}
+        }
+
+    override fun startAnimation(animation: Animation) {
+        // For some reason View##onAnimationEnd doesn't get called for
+        // exit transitions so we explicitly attach animation listener.
+        // We also have some animations that are an AnimationSet, so we don't wrap them
+        // in another set since it causes some visual glitches when going forward.
+        // We also set the listener only when going forward, since when going back,
+        // there is already a listener for dismiss action added, which would be overridden
+        // and also this is not necessary when going back since the lifecycle methods
+        // are correctly dispatched then.
+        // We also add fakeAnimation to the set of animations, which sends the progress of animation
+        val fakeAnimation = ScreensAnimation(fragment).apply { duration = animation.duration }
+
+        if (animation is AnimationSet && !fragment.isRemoving) {
+            animation
+                .apply {
+                    addAnimation(fakeAnimation)
+                    setAnimationListener(animationListener)
+                }.also {
+                    super.startAnimation(it)
+                }
+        } else {
+            AnimationSet(true)
+                .apply {
+                    addAnimation(animation)
+                    addAnimation(fakeAnimation)
+                    setAnimationListener(animationListener)
+                }.also {
+                    super.startAnimation(it)
+                }
+        }
+    }
+
+    /**
+     * This method implements a workaround for RN's autoFocus functionality. Because of the way
+     * autoFocus is implemented it dismisses soft keyboard in fragment transition
+     * due to change of visibility of the view at the start of the transition. Here we override the
+     * call to `clearFocus` when the visibility of view is `INVISIBLE` since `clearFocus` triggers the
+     * hiding of the keyboard in `ReactEditText.java`.
+     */
+    override fun clearFocus() {
+        if (visibility != INVISIBLE) {
+            super.clearFocus()
+        }
+    }
+
+    override fun onLayout(
+        changed: Boolean,
+        l: Int,
+        t: Int,
+        r: Int,
+        b: Int,
+    ) {
+        super.onLayout(changed, l, t, r, b)
+
+        if (fragment.screen.usesFormSheetPresentation()) {
+            fragment.screen.onBottomSheetBehaviorDidLayout(changed)
+        }
+    }
+}

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

@@ -11,8 +11,7 @@ extern const char RNSScreenComponentName[] = "RNSScreen";
 Point RNSScreenShadowNode::getContentOriginOffset(
     bool /*includeTransform*/) const {
   auto stateData = getStateData();
-  auto contentOffset = stateData.contentOffset;
-  return {contentOffset.x, contentOffset.y};
+  return stateData.contentOffset;
 }
 
 std::optional<std::reference_wrapper<const ShadowNode::Shared>>

package/ios/RNSConvert.mm

@@ -195,53 +195,50 @@
 + (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 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;
-    }
+#if !TARGET_OS_TV
+  switch (blurEffect) {
+    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
 

package/ios/RNSFullWindowOverlay.h

@@ -26,6 +26,8 @@ namespace react = facebook::react;
     RCTView <RCTInvalidating>
 #endif // RCT_NEW_ARCH_ENABLED
 
+@property (nonatomic) BOOL accessibilityContainerViewIsModal;
+
 #ifdef RCT_NEW_ARCH_ENABLED
 @property (nonatomic) react::LayoutMetrics oldLayoutMetrics;
 @property (nonatomic) react::LayoutMetrics newLayoutMetrics;

package/ios/RNSFullWindowOverlay.mm

@@ -17,10 +17,10 @@
 
 @implementation RNSFullWindowOverlayContainer
 
-- (instancetype)initWithFrame:(CGRect)frame
+- (instancetype)initWithFrame:(CGRect)frame accessibilityViewIsModal:(BOOL)accessibilityViewIsModal
 {
   if (self = [super initWithFrame:frame]) {
-    self.accessibilityViewIsModal = YES;
+    self.accessibilityViewIsModal = accessibilityViewIsModal;
   }
   return self;
 }
@@ -92,29 +92,37 @@
   if (self = [super init]) {
     static const auto defaultProps = std::make_shared<const react::RNSFullWindowOverlayProps>();
     _props = defaultProps;
-    [self _initCommon];
+    [self initCommonProps];
   }
   return self;
 }
-#endif // RCT_NEW_ARCH_ENABLED
-
+#else
 - (instancetype)initWithBridge:(RCTBridge *)bridge
 {
   if (self = [super init]) {
     _bridge = bridge;
-    [self _initCommon];
+    [self initCommonProps];
   }
 
   return self;
 }
+#endif // RCT_NEW_ARCH_ENABLED
 
-- (void)_initCommon
+- (void)initCommonProps
 {
+  // Default value used by container.
+  _accessibilityContainerViewIsModal = YES;
   _reactFrame = CGRectNull;
   _container = self.container;
   [self show];
 }
 
+- (void)setAccessibilityContainerViewIsModal:(BOOL)accessibilityContainerViewIsModal
+{
+  _accessibilityContainerViewIsModal = accessibilityContainerViewIsModal;
+  self.container.accessibilityViewIsModal = accessibilityContainerViewIsModal;
+}
+
 - (void)addSubview:(UIView *)view
 {
   [_container addSubview:view];
@@ -123,7 +131,8 @@
 - (RNSFullWindowOverlayContainer *)container
 {
   if (_container == nil) {
-    _container = [[RNSFullWindowOverlayContainer alloc] initWithFrame:_reactFrame];
+    _container = [[RNSFullWindowOverlayContainer alloc] initWithFrame:_reactFrame
+                                             accessibilityViewIsModal:_accessibilityContainerViewIsModal];
   }
 
   return _container;
@@ -220,6 +229,19 @@ RNS_IGNORE_SUPER_CALL_BEGIN
 
 RNS_IGNORE_SUPER_CALL_END
 
+- (void)updateProps:(const facebook::react::Props::Shared &)props
+           oldProps:(const facebook::react::Props::Shared &)oldProps
+{
+  const auto &oldComponentProps = *std::static_pointer_cast<const react::RNSFullWindowOverlayProps>(_props);
+  const auto &newComponentProps = *std::static_pointer_cast<const react::RNSFullWindowOverlayProps>(props);
+
+  if (newComponentProps.accessibilityContainerViewIsModal != oldComponentProps.accessibilityContainerViewIsModal) {
+    [self setAccessibilityContainerViewIsModal:newComponentProps.accessibilityContainerViewIsModal];
+  }
+
+  [super updateProps:props oldProps:oldProps];
+}
+
 #else
 #pragma mark - Paper specific
 
@@ -250,6 +272,8 @@ Class<RCTComponentViewProtocol> RNSFullWindowOverlayCls(void)
 
 RCT_EXPORT_MODULE()
 
+RCT_EXPORT_VIEW_PROPERTY(accessibilityContainerViewIsModal, BOOL)
+
 #ifdef RCT_NEW_ARCH_ENABLED
 #else
 - (UIView *)view

package/ios/RNSScreen.mm

@@ -151,12 +151,20 @@ RNS_IGNORE_SUPER_CALL_END
 #ifdef RCT_NEW_ARCH_ENABLED
   if (_state != nullptr) {
     RNSScreenStackHeaderConfig *config = [self findHeaderConfig];
-    // in large title, ScrollView handles the offset of content so we cannot set it here also.
-    CGFloat headerHeight =
-        config.largeTitle ? 0 : [_controller calculateHeaderHeightIsModal:self.isPresentedAsNativeModal];
-    auto newState =
-        react::RNSScreenState{RCTSizeFromCGSize(self.bounds.size), RCTPointFromCGPoint(CGPointMake(0, headerHeight))};
+
+    // in large title, ScrollView handles the offset of content so we cannot set it here also
+    // TODO: Why is it assumed in comment above, that large title uses scrollview here? What if only SafeAreaView is
+    // used?
+    // When config.translucent == true, we currently use `edgesForExtendedLayout` and the screen is laid out under the
+    // navigation bar, therefore there is no need to set content offset in shadow tree.
+    const CGFloat effectiveContentOffsetY = config.largeTitle || config.translucent
+        ? 0
+        : [_controller calculateHeaderHeightIsModal:self.isPresentedAsNativeModal];
+
+    auto newState = react::RNSScreenState{RCTSizeFromCGSize(self.bounds.size), {0, effectiveContentOffsetY}};
     _state->updateState(std::move(newState));
+
+    // TODO: Requesting layout on every layout is wrong. We should look for a way to get rid of this.
     UINavigationController *navctr = _controller.navigationController;
     [navctr.view setNeedsLayout];
   }
@@ -237,16 +245,7 @@ RNS_IGNORE_SUPER_CALL_END
 {
   switch (stackPresentation) {
     case RNSScreenStackPresentationModal:
-#if defined(__IPHONE_OS_VERSION_MAX_ALLOWED) && defined(__IPHONE_13_0) && \
-    __IPHONE_OS_VERSION_MAX_ALLOWED >= __IPHONE_13_0
-      if (@available(iOS 13.0, tvOS 13.0, *)) {
-        _controller.modalPresentationStyle = UIModalPresentationAutomatic;
-      } else {
-        _controller.modalPresentationStyle = UIModalPresentationFullScreen;
-      }
-#else
-      _controller.modalPresentationStyle = UIModalPresentationFullScreen;
-#endif
+      _controller.modalPresentationStyle = UIModalPresentationAutomatic;
 #if defined(__IPHONE_OS_VERSION_MAX_ALLOWED) && defined(__IPHONE_17_0) && \
     __IPHONE_OS_VERSION_MAX_ALLOWED >= __IPHONE_17_0 && !TARGET_OS_TV
       if (@available(iOS 18.0, *)) {
@@ -337,12 +336,7 @@ RNS_IGNORE_SUPER_CALL_END
 
 - (void)setGestureEnabled:(BOOL)gestureEnabled
 {
-#if defined(__IPHONE_OS_VERSION_MAX_ALLOWED) && defined(__IPHONE_13_0) && \
-    __IPHONE_OS_VERSION_MAX_ALLOWED >= __IPHONE_13_0
-  if (@available(iOS 13.0, tvOS 13.0, *)) {
-    _controller.modalInPresentation = !gestureEnabled;
-  }
-#endif
+  _controller.modalInPresentation = !gestureEnabled;
 
   _gestureEnabled = gestureEnabled;
 }
@@ -753,8 +747,6 @@ RNS_IGNORE_SUPER_CALL_END
   return _gestureEnabled;
 }
 
-#if defined(__IPHONE_OS_VERSION_MAX_ALLOWED) && defined(__IPHONE_13_0) && \
-    __IPHONE_OS_VERSION_MAX_ALLOWED >= __IPHONE_13_0
 - (void)presentationControllerDidAttemptToDismiss:(UIPresentationController *)presentationController
 {
   // NOTE(kkafar): We should consider depracating the use of gesture cancel here & align
@@ -764,7 +756,6 @@ RNS_IGNORE_SUPER_CALL_END
     [self notifyDismissCancelledWithDismissCount:1];
   }
 }
-#endif
 
 - (void)presentationControllerDidDismiss:(UIPresentationController *)presentationController
 {
@@ -1572,18 +1563,12 @@ Class<RCTComponentViewProtocol> RNSScreenCls(void)
 #if !TARGET_OS_TV && !TARGET_OS_VISION
   CGSize fallbackStatusBarSize = [[UIApplication sharedApplication] statusBarFrame].size;
 
-#if defined(__IPHONE_OS_VERSION_MAX_ALLOWED) && defined(__IPHONE_13_0) && \
-    __IPHONE_OS_VERSION_MAX_ALLOWED >= __IPHONE_13_0
-  if (@available(iOS 13.0, *)) {
-    CGSize primaryStatusBarSize = self.view.window.windowScene.statusBarManager.statusBarFrame.size;
-    if (primaryStatusBarSize.height == 0 || primaryStatusBarSize.width == 0)
-      return fallbackStatusBarSize;
-
-    return primaryStatusBarSize;
-  } else {
+  CGSize primaryStatusBarSize = self.view.window.windowScene.statusBarManager.statusBarFrame.size;
+  if (primaryStatusBarSize.height == 0 || primaryStatusBarSize.width == 0) {
     return fallbackStatusBarSize;
   }
-#endif /* Check for iOS 13.0 */
+
+  return primaryStatusBarSize;
 
 #else
   // TVOS does not have status bar.
@@ -1914,6 +1899,7 @@ Class<RCTComponentViewProtocol> RNSScreenCls(void)
   // if we dismissed the view natively, it will already be detached from view hierarchy
   if (self.view.window != nil) {
     UIView *snapshot = [self.view snapshotViewAfterScreenUpdates:NO];
+    snapshot.frame = self.view.frame;
     [self.view removeFromSuperview];
     self.view = snapshot;
     [superView addSubview:snapshot];

package/ios/RNSScreenStack.mm

@@ -492,14 +492,9 @@ RNS_IGNORE_SUPER_CALL_END
         UIViewController *next = controllers[i];
         BOOL lastModal = (i == controllers.count - 1);
 
-#if defined(__IPHONE_OS_VERSION_MAX_ALLOWED) && defined(__IPHONE_13_0) && \
-    __IPHONE_OS_VERSION_MAX_ALLOWED >= __IPHONE_13_0
-        if (@available(iOS 13.0, tvOS 13.0, *)) {
-          // Inherit UI style from its parent - solves an issue with incorrect style being applied to some UIKit views
-          // like date picker or segmented control.
-          next.overrideUserInterfaceStyle = self->_controller.overrideUserInterfaceStyle;
-        }
-#endif
+        // Inherit UI style from its parent - solves an issue with incorrect style being applied to some UIKit views
+        // like date picker or segmented control.
+        next.overrideUserInterfaceStyle = self->_controller.overrideUserInterfaceStyle;
 
         BOOL shouldAnimate = lastModal && [next isKindOfClass:[RNSScreen class]] &&
             ((RNSScreen *)next).screenView.stackAnimation != RNSScreenStackAnimationNone;
@@ -1234,6 +1229,9 @@ RNS_IGNORE_SUPER_CALL_END
                withSurfaceTelemetry:(const facebook::react::SurfaceTelemetry &)surfaceTelemetry
 {
   for (const auto &mutation : transaction.getMutations()) {
+    // Note that self.tag might be invalid in cases this stack is removed.
+    // This mostlikely does not cause any problems now, but it is something
+    // worth to be aware of.
     if (MUTATION_PARENT_TAG(mutation) == self.tag &&
         (mutation.type == react::ShadowViewMutation::Type::Insert ||
          mutation.type == react::ShadowViewMutation::Type::Remove)) {