react-native-screens 3.20.0 → 3.21.0

package/android/src/main/res/v33/anim-v33/rns_default_exit_in.xml

@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<set xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shareInterpolator="false">
+
+    <alpha
+        android:fromAlpha="1.0"
+        android:toAlpha="1.0"
+        android:fillEnabled="true"
+        android:fillBefore="true"
+        android:fillAfter="true"
+        android:interpolator="@android:interpolator/linear"
+        android:startOffset="0"
+        android:duration="450" />
+
+    <translate
+        android:fromXDelta="-10%"
+        android:toXDelta="0"
+        android:fillEnabled="true"
+        android:fillBefore="true"
+        android:fillAfter="true"
+        android:interpolator="@android:interpolator/fast_out_extra_slow_in"
+        android:startOffset="0"
+        android:duration="450" />
+
+    <extend
+        android:fromExtendLeft="0"
+        android:fromExtendTop="0"
+        android:fromExtendRight="10%"
+        android:fromExtendBottom="0"
+        android:toExtendLeft="0"
+        android:toExtendTop="0"
+        android:toExtendRight="10%"
+        android:toExtendBottom="0"
+        android:interpolator="@android:interpolator/fast_out_extra_slow_in"
+        android:startOffset="0"
+        android:duration="450" />
+</set>

package/android/src/main/res/v33/anim-v33/rns_default_exit_out.xml

@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<set xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shareInterpolator="false">
+
+    <alpha
+        android:fromAlpha="1.0"
+        android:toAlpha="0.0"
+        android:fillEnabled="true"
+        android:fillBefore="true"
+        android:fillAfter="true"
+        android:interpolator="@android:interpolator/linear"
+        android:startOffset="35"
+        android:duration="83" />
+
+    <translate
+        android:fromXDelta="0"
+        android:toXDelta="10%"
+        android:fillEnabled="true"
+        android:fillBefore="true"
+        android:fillAfter="true"
+        android:interpolator="@android:interpolator/fast_out_extra_slow_in"
+        android:startOffset="0"
+        android:duration="450" />
+
+    <extend
+        android:fromExtendLeft="10%"
+        android:fromExtendTop="0"
+        android:fromExtendRight="0"
+        android:fromExtendBottom="0"
+        android:toExtendLeft="10%"
+        android:toExtendTop="0"
+        android:toExtendRight="0"
+        android:toExtendBottom="0"
+        android:interpolator="@android:interpolator/fast_out_extra_slow_in"
+        android:startOffset="0"
+        android:duration="450" />
+</set>

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

@@ -23,6 +23,21 @@ public class RNSScreenManagerDelegate<T extends View, U extends BaseViewManagerI
   @Override
   public void setProperty(T view, String propName, @Nullable Object value) {
     switch (propName) {
+      case "sheetAllowedDetents":
+        mViewManager.setSheetAllowedDetents(view, (String) value);
+        break;
+      case "sheetLargestUndimmedDetent":
+        mViewManager.setSheetLargestUndimmedDetent(view, (String) value);
+        break;
+      case "sheetGrabberVisible":
+        mViewManager.setSheetGrabberVisible(view, value == null ? false : (boolean) value);
+        break;
+      case "sheetCornerRadius":
+        mViewManager.setSheetCornerRadius(view, value == null ? -1f : ((Double) value).floatValue());
+        break;
+      case "sheetExpandsWhenScrolledToEdge":
+        mViewManager.setSheetExpandsWhenScrolledToEdge(view, value == null ? false : (boolean) value);
+        break;
       case "customAnimationOnSwipe":
         mViewManager.setCustomAnimationOnSwipe(view, value == null ? false : (boolean) value);
         break;

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

@@ -14,6 +14,11 @@ import androidx.annotation.Nullable;
 import com.facebook.react.bridge.ReadableMap;
 
 public interface RNSScreenManagerInterface<T extends View> {
+  void setSheetAllowedDetents(T view, @Nullable String value);
+  void setSheetLargestUndimmedDetent(T view, @Nullable String value);
+  void setSheetGrabberVisible(T view, boolean value);
+  void setSheetCornerRadius(T view, float value);
+  void setSheetExpandsWhenScrolledToEdge(T view, boolean value);
   void setCustomAnimationOnSwipe(T view, boolean value);
   void setFullScreenSwipeEnabled(T view, boolean value);
   void setHomeIndicatorHidden(T view, boolean value);

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

@@ -34,6 +34,9 @@ public class RNSScreenStackHeaderConfigManagerDelegate<T extends View, U extends
       case "backTitleFontSize":
         mViewManager.setBackTitleFontSize(view, value == null ? 0 : ((Double) value).intValue());
         break;
+      case "backTitleVisible":
+        mViewManager.setBackTitleVisible(view, value == null ? true : (boolean) value);
+        break;
       case "color":
         mViewManager.setColor(view, ColorPropConverter.getColor(value, view.getContext()));
         break;

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

@@ -17,6 +17,7 @@ public interface RNSScreenStackHeaderConfigManagerInterface<T extends View> {
   void setBackTitle(T view, @Nullable String value);
   void setBackTitleFontFamily(T view, @Nullable String value);
   void setBackTitleFontSize(T view, int value);
+  void setBackTitleVisible(T view, boolean value);
   void setColor(T view, @Nullable Integer value);
   void setDirection(T view, @Nullable String value);
   void setHidden(T view, boolean value);

package/common/cpp/react/renderer/components/rnscreens/RNSScreenState.h

@@ -1,8 +1,7 @@
 #pragma once
 
 #include <react/renderer/graphics/Float.h>
-#include <react/renderer/graphics/Geometry.h>
-#include <react/renderer/graphics/conversions.h>
+#include <react/renderer/core/graphicsConversions.h>
 
 #ifdef ANDROID
 #include <folly/dynamic.h>

package/ios/RCTImageComponentView+RNSScreenStackHeaderConfig.h

@@ -0,0 +1,11 @@
+#ifdef RCT_NEW_ARCH_ENABLED
+
+#include <React/RCTImageComponentView.h>
+
+@interface RCTImageComponentView (RNSScreenStackHeaderConfig)
+
+- (UIImage *)image;
+
+@end
+
+#endif // RCT_NEW_ARCH_ENABLED

package/ios/RCTImageComponentView+RNSScreenStackHeaderConfig.mm

@@ -0,0 +1,14 @@
+#ifdef RCT_NEW_ARCH_ENABLED
+
+#include "RCTImageComponentView+RNSScreenStackHeaderConfig.h"
+
+@implementation RCTImageComponentView (RNSScreenStackHeaderConfig)
+
+- (UIImage *)image
+{
+  return _imageView.image;
+}
+
+@end
+
+#endif // RCT_NEW_ARCH_ENABLED

package/ios/RNSConvert.h

@@ -1,4 +1,4 @@
-#ifdef RN_FABRIC_ENABLED
+#ifdef RCT_NEW_ARCH_ENABLED
 #import <react/renderer/components/rnscreens/Props.h>
 #import "RNSEnums.h"
 
@@ -19,6 +19,12 @@
 + (RNSScreenSwipeDirection)RNSScreenSwipeDirectionFromCppEquivalent:
     (facebook::react::RNSScreenSwipeDirection)swipeDirection;
 
++ (RNSScreenDetentType)RNSScreenDetentTypeFromAllowedDetents:
+    (facebook::react::RNSScreenSheetAllowedDetents)allowedDetents;
+
++ (RNSScreenDetentType)RNSScreenDetentTypeFromLargestUndimmedDetent:
+    (facebook::react::RNSScreenSheetLargestUndimmedDetent)detent;
+
 + (NSDictionary *)gestureResponseDistanceDictFromCppStruct:
     (const facebook::react::RNSScreenGestureResponseDistanceStruct &)gestureResponseDistance;
 
@@ -27,4 +33,4 @@
 
 @end
 
-#endif // RN_FABRIC_ENABLED
+#endif // RCT_NEW_ARCH_ENABLED

package/ios/RNSConvert.mm

@@ -1,6 +1,6 @@
 #import "RNSConvert.h"
 
-#ifdef RN_FABRIC_ENABLED
+#ifdef RCT_NEW_ARCH_ENABLED
 @implementation RNSConvert
 
 + (RNSScreenStackPresentation)RNSScreenStackPresentationFromCppEquivalent:
@@ -89,6 +89,32 @@
   }
 }
 
++ (RNSScreenDetentType)RNSScreenDetentTypeFromAllowedDetents:
+    (facebook::react::RNSScreenSheetAllowedDetents)allowedDetents
+{
+  switch (allowedDetents) {
+    case facebook::react::RNSScreenSheetAllowedDetents::All:
+      return RNSScreenDetentTypeAll;
+    case facebook::react::RNSScreenSheetAllowedDetents::Large:
+      return RNSScreenDetentTypeLarge;
+    case facebook::react::RNSScreenSheetAllowedDetents::Medium:
+      return RNSScreenDetentTypeMedium;
+  }
+}
+
++ (RNSScreenDetentType)RNSScreenDetentTypeFromLargestUndimmedDetent:
+    (facebook::react::RNSScreenSheetLargestUndimmedDetent)detent
+{
+  switch (detent) {
+    case facebook::react::RNSScreenSheetLargestUndimmedDetent::All:
+      return RNSScreenDetentTypeAll;
+    case facebook::react::RNSScreenSheetLargestUndimmedDetent::Large:
+      return RNSScreenDetentTypeLarge;
+    case facebook::react::RNSScreenSheetLargestUndimmedDetent::Medium:
+      return RNSScreenDetentTypeMedium;
+  }
+}
+
 + (NSDictionary *)gestureResponseDistanceDictFromCppStruct:
     (const facebook::react::RNSScreenGestureResponseDistanceStruct &)gestureResponseDistance
 {
@@ -117,4 +143,4 @@
 
 @end
 
-#endif // RN_FABRIC_ENABLED
+#endif // RCT_NEW_ARCH_ENABLED

package/ios/RNSEnums.h

@@ -57,3 +57,9 @@ typedef NS_ENUM(NSInteger, RNSScreenStackHeaderSubviewType) {
   RNSScreenStackHeaderSubviewTypeCenter,
   RNSScreenStackHeaderSubviewTypeSearchBar,
 };
+
+typedef NS_ENUM(NSInteger, RNSScreenDetentType) {
+  RNSScreenDetentTypeMedium,
+  RNSScreenDetentTypeLarge,
+  RNSScreenDetentTypeAll,
+};

package/ios/RNSFullWindowOverlay.h

@@ -1,6 +1,6 @@
 #import <React/RCTViewManager.h>
 
-#ifdef RN_FABRIC_ENABLED
+#ifdef RCT_NEW_ARCH_ENABLED
 #import <React/RCTViewComponentView.h>
 #else
 #import <React/RCTInvalidating.h>
@@ -16,15 +16,15 @@
 @end
 
 @interface RNSFullWindowOverlay :
-#ifdef RN_FABRIC_ENABLED
+#ifdef RCT_NEW_ARCH_ENABLED
     RCTViewComponentView
 #else
     RCTView <RCTInvalidating>
-#endif // RN_FABRIC_ENABLED
+#endif // RCT_NEW_ARCH_ENABLED
 
-#ifdef RN_FABRIC_ENABLED
+#ifdef RCT_NEW_ARCH_ENABLED
 @property (nonatomic) facebook::react::LayoutMetrics oldLayoutMetrics;
 @property (nonatomic) facebook::react::LayoutMetrics newLayoutMetrics;
-#endif // RN_FABRIC_ENABLED
+#endif // RCT_NEW_ARCH_ENABLED
 
 @end

package/ios/RNSFullWindowOverlay.mm

@@ -2,7 +2,7 @@
 
 #import "RNSFullWindowOverlay.h"
 
-#ifdef RN_FABRIC_ENABLED
+#ifdef RCT_NEW_ARCH_ENABLED
 #import <React/RCTConversions.h>
 #import <React/RCTFabricComponentsPlugins.h>
 #import <React/RCTSurfaceTouchHandler.h>
@@ -11,7 +11,7 @@
 #import <react/renderer/components/rnscreens/RCTComponentViewHelpers.h>
 #else
 #import <React/RCTTouchHandler.h>
-#endif // RN_FABRIC_ENABLED
+#endif // RCT_NEW_ARCH_ENABLED
 
 @implementation RNSFullWindowOverlayContainer
 
@@ -63,14 +63,14 @@
   __weak RCTBridge *_bridge;
   RNSFullWindowOverlayContainer *_container;
   CGRect _reactFrame;
-#ifdef RN_FABRIC_ENABLED
+#ifdef RCT_NEW_ARCH_ENABLED
   RCTSurfaceTouchHandler *_touchHandler;
 #else
   RCTTouchHandler *_touchHandler;
-#endif // RN_FABRIC_ENABLED
+#endif // RCT_NEW_ARCH_ENABLED
 }
 
-#ifdef RN_FABRIC_ENABLED
+#ifdef RCT_NEW_ARCH_ENABLED
 - (instancetype)init
 {
   if (self = [super init]) {
@@ -80,7 +80,7 @@
   }
   return self;
 }
-#endif // RN_FABRIC_ENABLED
+#endif // RCT_NEW_ARCH_ENABLED
 
 - (instancetype)initWithBridge:(RCTBridge *)bridge
 {
@@ -128,7 +128,7 @@
     }
   } else {
     if (_touchHandler == nil) {
-#ifdef RN_FABRIC_ENABLED
+#ifdef RCT_NEW_ARCH_ENABLED
       _touchHandler = [RCTSurfaceTouchHandler new];
 #else
       _touchHandler = [[RCTTouchHandler alloc] initWithBridge:_bridge];
@@ -138,7 +138,7 @@
   }
 }
 
-#ifdef RN_FABRIC_ENABLED
+#ifdef RCT_NEW_ARCH_ENABLED
 #pragma mark - Fabric Specific
 
 // When the component unmounts we remove it from window's children,
@@ -205,27 +205,27 @@
   _container = nil;
 }
 
-#endif // RN_FABRIC_ENABLED
+#endif // RCT_NEW_ARCH_ENABLED
 
 @end
 
-#ifdef RN_FABRIC_ENABLED
+#ifdef RCT_NEW_ARCH_ENABLED
 Class<RCTComponentViewProtocol> RNSFullWindowOverlayCls(void)
 {
   return RNSFullWindowOverlay.class;
 }
-#endif // RN_FABRIC_ENABLED
+#endif // RCT_NEW_ARCH_ENABLED
 
 @implementation RNSFullWindowOverlayManager
 
 RCT_EXPORT_MODULE()
 
-#ifdef RN_FABRIC_ENABLED
+#ifdef RCT_NEW_ARCH_ENABLED
 #else
 - (UIView *)view
 {
   return [[RNSFullWindowOverlay alloc] initWithBridge:self.bridge];
 }
-#endif // RN_FABRIC_ENABLED
+#endif // RCT_NEW_ARCH_ENABLED
 
 @end

package/ios/RNSScreen.h

@@ -4,7 +4,7 @@
 #import "RNSEnums.h"
 #import "RNSScreenContainer.h"
 
-#if RN_FABRIC_ENABLED
+#if RCT_NEW_ARCH_ENABLED
 #import <React/RCTViewComponentView.h>
 #else
 #import <React/RCTView.h>
@@ -33,7 +33,7 @@ NS_ASSUME_NONNULL_BEGIN
 - (UIViewController *)findChildVCForConfigAndTrait:(RNSWindowTrait)trait includingModals:(BOOL)includingModals;
 - (void)notifyFinishTransitioning;
 - (RNSScreenView *)screenView;
-#ifdef RN_FABRIC_ENABLED
+#ifdef RCT_NEW_ARCH_ENABLED
 - (void)setViewToSnapshot:(UIView *)snapshot;
 - (void)resetViewToScreen;
 #endif
@@ -41,7 +41,7 @@ NS_ASSUME_NONNULL_BEGIN
 @end
 
 @interface RNSScreenView :
-#ifdef RN_FABRIC_ENABLED
+#ifdef RCT_NEW_ARCH_ENABLED
     RCTViewComponentView
 #else
     RCTView
@@ -75,9 +75,16 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nonatomic) UIInterfaceOrientationMask screenOrientation;
 @property (nonatomic) BOOL statusBarHidden;
 @property (nonatomic) BOOL homeIndicatorHidden;
+
+// Props controlling UISheetPresentationController
+@property (nonatomic) RNSScreenDetentType sheetAllowedDetents;
+@property (nonatomic) RNSScreenDetentType sheetLargestUndimmedDetent;
+@property (nonatomic) BOOL sheetGrabberVisible;
+@property (nonatomic) CGFloat sheetCornerRadius;
+@property (nonatomic) BOOL sheetExpandsWhenScrolledToEdge;
 #endif // !TARGET_OS_TV
 
-#ifdef RN_FABRIC_ENABLED
+#ifdef RCT_NEW_ARCH_ENABLED
 // we recreate the behavior of `reactSetFrame` on new architecture
 @property (nonatomic) facebook::react::LayoutMetrics oldLayoutMetrics;
 @property (nonatomic) facebook::react::LayoutMetrics newLayoutMetrics;
@@ -90,11 +97,11 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nonatomic, copy) RCTDirectEventBlock onWillDisappear;
 @property (nonatomic, copy) RCTDirectEventBlock onNativeDismissCancelled;
 @property (nonatomic, copy) RCTDirectEventBlock onTransitionProgress;
-#endif // RN_FABRIC_ENABLED
+#endif // RCT_NEW_ARCH_ENABLED
 
 - (void)notifyFinishTransitioning;
 
-#ifdef RN_FABRIC_ENABLED
+#ifdef RCT_NEW_ARCH_ENABLED
 - (void)notifyWillAppear;
 - (void)notifyWillDisappear;
 - (void)notifyAppear;
@@ -104,6 +111,7 @@ NS_ASSUME_NONNULL_BEGIN
 #endif
 
 - (void)notifyTransitionProgress:(double)progress closing:(BOOL)closing goingForward:(BOOL)goingForward;
+- (void)notifyDismissCancelledWithDismissCount:(int)dismissCount;
 - (BOOL)isModal;
 
 @end