From b80a92a248bc10b0fc98ee510431f1585693546d Mon Sep 17 00:00:00 2001
From: alduzy <alduzy@gmail.com>
Date: Tue, 1 Oct 2024 15:24:39 +0200
Subject: [PATCH 01/10] feat(iOS): sheetInitialDetent support

---
 apps/src/tests/Test2002.tsx | 9 ++++++---
 ios/RNSScreen.h             | 1 +
 ios/RNSScreen.mm            | 8 ++++++++
 3 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/apps/src/tests/Test2002.tsx b/apps/src/tests/Test2002.tsx
index 55a5a39979..904a763fb7 100644
--- a/apps/src/tests/Test2002.tsx
+++ b/apps/src/tests/Test2002.tsx
@@ -7,7 +7,7 @@ import {
 } from '@react-navigation/native';
 import { createNativeStackNavigator } from '@react-navigation/native-stack';
 
-function HomeScreen({ navigation }) {
+function HomeScreen({ navigation }: any) {
   return (
     <View style={styles.container}>
       <Button
@@ -22,7 +22,7 @@ function HomeScreen({ navigation }) {
   );
 }
 
-function ModalScreen({ navigation }) {
+function ModalScreen({ navigation }: any) {
   return (
     <View style={styles.container}>
       <Button onPress={() => navigation.goBack()} title="Dismiss" />
@@ -42,7 +42,10 @@ export default function App() {
         <RootStack.Screen
           name="formSheet"
           component={ModalScreen}
-          options={{ presentation: 'formSheet' }}
+          options={{
+            presentation: 'formSheet',
+            sheetAllowedDetents: [0.3, 0.5, 0.8],
+          }}
         />
         <RootStack.Screen
           name="fullScreenModal"
diff --git a/ios/RNSScreen.h b/ios/RNSScreen.h
index a5b98f4cc1..28cbedbf7e 100644
--- a/ios/RNSScreen.h
+++ b/ios/RNSScreen.h
@@ -90,6 +90,7 @@ namespace react = facebook::react;
 @property (nonatomic) NSNumber *sheetLargestUndimmedDetent;
 @property (nonatomic) BOOL sheetGrabberVisible;
 @property (nonatomic) CGFloat sheetCornerRadius;
+@property (nonatomic) NSInteger sheetInitialDetent;
 @property (nonatomic) BOOL sheetExpandsWhenScrolledToEdge;
 #endif // !TARGET_OS_TV
 
diff --git a/ios/RNSScreen.mm b/ios/RNSScreen.mm
index b91f83cc89..33f7f286df 100644
--- a/ios/RNSScreen.mm
+++ b/ios/RNSScreen.mm
@@ -902,6 +902,13 @@ - (void)updateFormSheetPresentationStyle
           [self setAllowedDetentsForSheet:sheet
                                        to:[self detentsFromMaxHeightFractions:_sheetAllowedDetents]
                                   animate:NO];
+
+          if (_sheetInitialDetent > 0 && _sheetInitialDetent < _sheetAllowedDetents.count) {
+            UISheetPresentationControllerDetent *detent = sheet.detents[_sheetInitialDetent];
+            [self setSelectedDetentForSheet:sheet to:detent.identifier animate:YES];
+          } else {
+            RCTLogError(@"[RNScreens] sheetInitialDetent out of bounds for sheetAllowedDetents array");
+          }
         }
       }
     } else
@@ -1864,6 +1871,7 @@ @implementation RNSScreenManager
 RCT_EXPORT_VIEW_PROPERTY(sheetLargestUndimmedDetent, NSNumber *);
 RCT_EXPORT_VIEW_PROPERTY(sheetGrabberVisible, BOOL);
 RCT_EXPORT_VIEW_PROPERTY(sheetCornerRadius, CGFloat);
+RCT_EXPORT_VIEW_PROPERTY(sheetInitialDetent, NSInteger);
 RCT_EXPORT_VIEW_PROPERTY(sheetExpandsWhenScrolledToEdge, BOOL);
 #endif
 

From 4c9e41573144985a75cb22887261e2f80c16b192 Mon Sep 17 00:00:00 2001
From: alduzy <alduzy@gmail.com>
Date: Tue, 1 Oct 2024 15:33:53 +0200
Subject: [PATCH 02/10] updated sheetInitialDetent README

---
 native-stack/README.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/native-stack/README.md b/native-stack/README.md
index c6649591e6..a78713d688 100644
--- a/native-stack/README.md
+++ b/native-stack/README.md
@@ -287,9 +287,11 @@ Defaults to system default.
 
 #### `sheetInitialDetent`
 
-Initial detent for the sheet.
+Index of the initial detent for the sheet.
 Works only when `presentation` is set to `formSheet`.
 
+The detents must be defined in `sheetAllowedDetents` array.
+
 #### `sheetGrabberVisible` (iOS only)
 
 Boolean indicating whether the sheet shows a grabber at the top.

From bb7d5a0c9d4c59bf4084f1023ebbef43f1498bb0 Mon Sep 17 00:00:00 2001
From: alduzy <alduzy@gmail.com>
Date: Tue, 1 Oct 2024 15:42:12 +0200
Subject: [PATCH 03/10] repro improvements

---
 apps/src/tests/Test2002.tsx | 26 ++++++++++++++++++++++----
 1 file changed, 22 insertions(+), 4 deletions(-)

diff --git a/apps/src/tests/Test2002.tsx b/apps/src/tests/Test2002.tsx
index 904a763fb7..098813c201 100644
--- a/apps/src/tests/Test2002.tsx
+++ b/apps/src/tests/Test2002.tsx
@@ -5,9 +5,22 @@ import {
   DefaultTheme,
   NavigationContainer,
 } from '@react-navigation/native';
-import { createNativeStackNavigator } from '@react-navigation/native-stack';
+import {
+  createNativeStackNavigator,
+  NativeStackNavigationProp,
+} from '@react-navigation/native-stack';
+
+type StackParamList = {
+  Home: undefined;
+  formSheet: undefined;
+  fullScreenModal: undefined;
+};
 
-function HomeScreen({ navigation }: any) {
+function HomeScreen({
+  navigation,
+}: {
+  navigation: NativeStackNavigationProp<StackParamList>;
+}) {
   return (
     <View style={styles.container}>
       <Button
@@ -22,7 +35,11 @@ function HomeScreen({ navigation }: any) {
   );
 }
 
-function ModalScreen({ navigation }: any) {
+function ModalScreen({
+  navigation,
+}: {
+  navigation: NativeStackNavigationProp<StackParamList>;
+}) {
   return (
     <View style={styles.container}>
       <Button onPress={() => navigation.goBack()} title="Dismiss" />
@@ -30,7 +47,7 @@ function ModalScreen({ navigation }: any) {
   );
 }
 
-const RootStack = createNativeStackNavigator();
+const RootStack = createNativeStackNavigator<StackParamList>();
 
 export default function App() {
   const scheme = useColorScheme();
@@ -45,6 +62,7 @@ export default function App() {
           options={{
             presentation: 'formSheet',
             sheetAllowedDetents: [0.3, 0.5, 0.8],
+            sheetInitialDetent: 1,
           }}
         />
         <RootStack.Screen

From c605be50ee3a1321780c697963aeb684cdb47f67 Mon Sep 17 00:00:00 2001
From: alduzy <alduzy@gmail.com>
Date: Tue, 1 Oct 2024 15:45:47 +0200
Subject: [PATCH 04/10] improved error handling

---
 ios/RNSScreen.mm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ios/RNSScreen.mm b/ios/RNSScreen.mm
index 33f7f286df..ab4077f951 100644
--- a/ios/RNSScreen.mm
+++ b/ios/RNSScreen.mm
@@ -906,7 +906,7 @@ - (void)updateFormSheetPresentationStyle
           if (_sheetInitialDetent > 0 && _sheetInitialDetent < _sheetAllowedDetents.count) {
             UISheetPresentationControllerDetent *detent = sheet.detents[_sheetInitialDetent];
             [self setSelectedDetentForSheet:sheet to:detent.identifier animate:YES];
-          } else {
+          } else if (_sheetInitialDetent != 0) {
             RCTLogError(@"[RNScreens] sheetInitialDetent out of bounds for sheetAllowedDetents array");
           }
         }

From 2eb9031111ec5113c7c67d2c7ec89f1e2dff41ad Mon Sep 17 00:00:00 2001
From: alduzy <alduzy@gmail.com>
Date: Tue, 1 Oct 2024 16:10:44 +0200
Subject: [PATCH 05/10] copied definition from types

---
 native-stack/README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/native-stack/README.md b/native-stack/README.md
index a78713d688..20f8734077 100644
--- a/native-stack/README.md
+++ b/native-stack/README.md
@@ -287,10 +287,10 @@ Defaults to system default.
 
 #### `sheetInitialDetent`
 
-Index of the initial detent for the sheet.
+Index of the detent the sheet should expand to after being opened.
 Works only when `presentation` is set to `formSheet`.
 
-The detents must be defined in `sheetAllowedDetents` array.
+Defaults to `0` - which represents first detent in the detents array.
 
 #### `sheetGrabberVisible` (iOS only)
 

From 49551f4444373946b2788507f21c7d9477811aa3 Mon Sep 17 00:00:00 2001
From: alduzy <alduzy@gmail.com>
Date: Tue, 1 Oct 2024 16:32:10 +0200
Subject: [PATCH 06/10] updating props

---
 ios/RNSScreen.mm | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/ios/RNSScreen.mm b/ios/RNSScreen.mm
index ab4077f951..395089df72 100644
--- a/ios/RNSScreen.mm
+++ b/ios/RNSScreen.mm
@@ -1158,6 +1158,10 @@ - (void)updateProps:(react::Props::Shared const &)props oldProps:(react::Props::
     [self setSheetAllowedDetents:[RNSConvert detentFractionsArrayFromVector:newScreenProps.sheetAllowedDetents]];
   }
 
+  if (newScreenProps.sheetInitialDetent != oldScreenProps.sheetInitialDetent) {
+    [self setSheetInitialDetent:newScreenProps.sheetInitialDetent];
+  }
+
   if (newScreenProps.sheetLargestUndimmedDetent != oldScreenProps.sheetLargestUndimmedDetent) {
     [self setSheetLargestUndimmedDetent:[NSNumber numberWithInt:newScreenProps.sheetLargestUndimmedDetent]];
   }

From 2571095d2decdee32b2beaac8cd6b139c7804044 Mon Sep 17 00:00:00 2001
From: alduzy <alduzy@gmail.com>
Date: Tue, 1 Oct 2024 16:36:26 +0200
Subject: [PATCH 07/10] addded missing prop fabric

---
 src/fabric/ModalScreenNativeComponent.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/fabric/ModalScreenNativeComponent.ts b/src/fabric/ModalScreenNativeComponent.ts
index 979dddeeeb..1a675c2c84 100644
--- a/src/fabric/ModalScreenNativeComponent.ts
+++ b/src/fabric/ModalScreenNativeComponent.ts
@@ -75,6 +75,7 @@ export interface NativeProps extends ViewProps {
   sheetGrabberVisible?: WithDefault<boolean, false>;
   sheetCornerRadius?: WithDefault<Float, -1.0>;
   sheetExpandsWhenScrolledToEdge?: WithDefault<boolean, false>;
+  sheetInitialDetent?: WithDefault<Int32, 0>;
   customAnimationOnSwipe?: boolean;
   fullScreenSwipeEnabled?: boolean;
   fullScreenSwipeShadowEnabled?: boolean;

From 00ac89189e746912070a967a5cd45bf9ef0a2b03 Mon Sep 17 00:00:00 2001
From: alduzy <alduzy@gmail.com>
Date: Wed, 2 Oct 2024 10:13:53 +0200
Subject: [PATCH 08/10] handling iOS < 16

---
 ios/RNSScreen.mm | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/ios/RNSScreen.mm b/ios/RNSScreen.mm
index 395089df72..2412e72677 100644
--- a/ios/RNSScreen.mm
+++ b/ios/RNSScreen.mm
@@ -934,6 +934,12 @@ - (void)updateFormSheetPresentationStyle
                                          UISheetPresentationControllerDetent.largeDetent
                                        ]
                                   animate:YES];
+          if (_sheetInitialDetent == 1) {
+            [self setSelectedDetentForSheet:sheet to:UISheetPresentationControllerDetentIdentifierLarge animate:YES];
+          } else if (_sheetInitialDetent != 0) {
+            RCTLogError(
+                @"[RNScreens] sheetInitialDetent out of bounds, on iOS versions below 16 sheetAllowedDetents array defaults to two items");
+          }
         } else {
           RCTLogError(@"[RNScreens] The values in sheetAllowedDetents array must be sorted");
         }

From 239bb3df655e2e3865c64f5b46e4d5988e8ecafc Mon Sep 17 00:00:00 2001
From: alduzy <alduzy@gmail.com>
Date: Wed, 2 Oct 2024 10:56:52 +0200
Subject: [PATCH 09/10] moved initialDetent logic away from allowedDetents

---
 ios/RNSScreen.mm | 33 ++++++++++++++++++++-------------
 1 file changed, 20 insertions(+), 13 deletions(-)

diff --git a/ios/RNSScreen.mm b/ios/RNSScreen.mm
index 2412e72677..0e0681391d 100644
--- a/ios/RNSScreen.mm
+++ b/ios/RNSScreen.mm
@@ -902,13 +902,6 @@ - (void)updateFormSheetPresentationStyle
           [self setAllowedDetentsForSheet:sheet
                                        to:[self detentsFromMaxHeightFractions:_sheetAllowedDetents]
                                   animate:NO];
-
-          if (_sheetInitialDetent > 0 && _sheetInitialDetent < _sheetAllowedDetents.count) {
-            UISheetPresentationControllerDetent *detent = sheet.detents[_sheetInitialDetent];
-            [self setSelectedDetentForSheet:sheet to:detent.identifier animate:YES];
-          } else if (_sheetInitialDetent != 0) {
-            RCTLogError(@"[RNScreens] sheetInitialDetent out of bounds for sheetAllowedDetents array");
-          }
         }
       }
     } else
@@ -934,12 +927,6 @@ - (void)updateFormSheetPresentationStyle
                                          UISheetPresentationControllerDetent.largeDetent
                                        ]
                                   animate:YES];
-          if (_sheetInitialDetent == 1) {
-            [self setSelectedDetentForSheet:sheet to:UISheetPresentationControllerDetentIdentifierLarge animate:YES];
-          } else if (_sheetInitialDetent != 0) {
-            RCTLogError(
-                @"[RNScreens] sheetInitialDetent out of bounds, on iOS versions below 16 sheetAllowedDetents array defaults to two items");
-          }
         } else {
           RCTLogError(@"[RNScreens] The values in sheetAllowedDetents array must be sorted");
         }
@@ -957,6 +944,26 @@ - (void)updateFormSheetPresentationStyle
       }
     }
 
+    if (_sheetInitialDetent > 0 && _sheetInitialDetent < _sheetAllowedDetents.count) {
+#if defined(__IPHONE_OS_VERSION_MAX_ALLOWED) && defined(__IPHONE_16_0) && \
+    __IPHONE_OS_VERSION_MAX_ALLOWED >= __IPHONE_16_0
+      if (@available(iOS 16.0, *)) {
+        UISheetPresentationControllerDetent *detent = sheet.detents[_sheetInitialDetent];
+        [self setSelectedDetentForSheet:sheet to:detent.identifier animate:YES];
+      } else
+#endif // Check for iOS >= 16
+      {
+        if (_sheetInitialDetent < 2) {
+          [self setSelectedDetentForSheet:sheet to:UISheetPresentationControllerDetentIdentifierLarge animate:YES];
+        } else {
+          RCTLogError(
+              @"[RNScreens] sheetInitialDetent out of bounds, on iOS versions below 16 sheetAllowedDetents is ignored in favor of an array of two system-defined detents");
+        }
+      }
+    } else if (_sheetInitialDetent != 0) {
+      RCTLogError(@"[RNScreens] sheetInitialDetent out of bounds for sheetAllowedDetents array");
+    }
+
     sheet.prefersScrollingExpandsWhenScrolledToEdge = _sheetExpandsWhenScrolledToEdge;
     [self setGrabberVisibleForSheet:sheet to:_sheetGrabberVisible animate:YES];
     [self setCornerRadiusForSheet:sheet to:_sheetCornerRadius animate:YES];

From fd821d16037a3b93e881719aba96212ee30e4b96 Mon Sep 17 00:00:00 2001
From: alduzy <alduzy@gmail.com>
Date: Wed, 2 Oct 2024 11:19:25 +0200
Subject: [PATCH 10/10] fix iOS 16 condition

---
 ios/RNSScreen.mm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ios/RNSScreen.mm b/ios/RNSScreen.mm
index 0e0681391d..dba3b4fef7 100644
--- a/ios/RNSScreen.mm
+++ b/ios/RNSScreen.mm
@@ -889,8 +889,8 @@ - (void)updateFormSheetPresentationStyle
     sheet.delegate = self;
 #if defined(__IPHONE_OS_VERSION_MAX_ALLOWED) && defined(__IPHONE_16_0) && \
     __IPHONE_OS_VERSION_MAX_ALLOWED >= __IPHONE_16_0
-    if (_sheetAllowedDetents.count > 0) {
-      if (@available(iOS 16.0, *)) {
+    if (@available(iOS 16.0, *)) {
+      if (_sheetAllowedDetents.count > 0) {
         if (_sheetAllowedDetents.count == 1 && [_sheetAllowedDetents[0] integerValue] == SHEET_FIT_TO_CONTENTS) {
           // This is `fitToContents` case, where sheet should be just high to display its contents.
           // Paper: we do not set anything here, we will set once React computed layout of our React's children, namely