@@ -255,8 +255,7 @@ - (void)setStackPresentation:(RNSScreenStackPresentation)stackPresentation
255255 switch (stackPresentation) {
256256 case RNSScreenStackPresentationModal:
257257 _controller.modalPresentationStyle = UIModalPresentationAutomatic;
258- #if defined(__IPHONE_OS_VERSION_MAX_ALLOWED) && defined(__IPHONE_17_0) && \
259- __IPHONE_OS_VERSION_MAX_ALLOWED >= __IPHONE_17_0 && !TARGET_OS_TV
258+ #if RNS_IPHONE_OS_VERSION_AVAILABLE(17_0) && !TARGET_OS_TV
260259 if (@available (iOS 18.0 , *)) {
261260 UISheetPresentationController *sheetController = _controller.sheetPresentationController ;
262261 if (sheetController != nil ) {
@@ -266,7 +265,7 @@ - (void)setStackPresentation:(RNSScreenStackPresentation)stackPresentation
266265 @" [RNScreens] sheetPresentationController is null when attempting to set prefersPageSizing for modal" );
267266 }
268267 }
269- #endif
268+ #endif // RNS_IPHONE_OS_VERSION_AVAILABLE(17_0) && !TARGET_OS_TV
270269 break ;
271270
272271 case RNSScreenStackPresentationPageSheet:
@@ -457,8 +456,7 @@ - (void)contentWrapper:(RNSScreenContentWrapper *)contentWrapper receivedReactFr
457456 return ;
458457 }
459458
460- #if !TARGET_OS_TV && !TARGET_OS_VISION && defined(__IPHONE_OS_VERSION_MAX_ALLOWED) && defined(__IPHONE_16_0) && \
461- __IPHONE_OS_VERSION_MAX_ALLOWED >= __IPHONE_16_0
459+ #if !TARGET_OS_TV && !TARGET_OS_VISION && RNS_IPHONE_OS_VERSION_AVAILABLE(16_0)
462460 if (@available (iOS 16.0 , *)) {
463461 UISheetPresentationController *sheetController = _controller.sheetPresentationController ;
464462 if (sheetController == nil ) {
@@ -473,7 +471,7 @@ - (void)contentWrapper:(RNSScreenContentWrapper *)contentWrapper receivedReactFr
473471 [self setAllowedDetentsForSheet: sheetController to: detents animate: YES ];
474472 }
475473 }
476- #endif // Check for iOS >= 16 && !TARGET_OS_TV
474+ #endif // Check for iOS >= 16 && !TARGET_OS_TV && !TARGET_OS_VISION
477475}
478476
479477- (void )addSubview : (UIView *)view
@@ -924,14 +922,11 @@ - (void)setLargestUndimmedDetentForSheet:(UISheetPresentationController *)sheet
924922 }
925923}
926924
927- #if defined(__IPHONE_OS_VERSION_MAX_ALLOWED) && defined(__IPHONE_15_0) && \
928- __IPHONE_OS_VERSION_MAX_ALLOWED >= __IPHONE_15_0
929925- (NSInteger )detentIndexFromDetentIdentifier : (UISheetPresentationControllerDetentIdentifier)identifier
930926 API_AVAILABLE(ios(15.0 ))
931927{
932928 // We first check if we are running on iOS 16+ as the API is different
933- #if defined(__IPHONE_OS_VERSION_MAX_ALLOWED) && defined(__IPHONE_16_0) && \
934- __IPHONE_OS_VERSION_MAX_ALLOWED >= __IPHONE_16_0
929+ #if RNS_IPHONE_OS_VERSION_AVAILABLE(16_0)
935930 if (_sheetAllowedDetents.count > 0 ) {
936931 // We should be running on custom detents in this case, thus identifier should be a stringified number.
937932 return identifier.integerValue ;
@@ -961,7 +956,6 @@ - (void)sheetPresentationControllerDidChangeSelectedDetentIdentifier:
961956 UISheetPresentationControllerDetentIdentifier ident = sheetPresentationController.selectedDetentIdentifier ;
962957 [self notifySheetDetentChangeToIndex: [self detentIndexFromDetentIdentifier: ident] isStable: YES ];
963958}
964- #endif // iOS 15 check
965959
966960/* *
967961 * Updates settings for sheet presentation controller.
@@ -975,8 +969,6 @@ - (void)updateFormSheetPresentationStyle
975969 return ;
976970 }
977971
978- #if defined(__IPHONE_OS_VERSION_MAX_ALLOWED) && defined(__IPHONE_15_0) && \
979- __IPHONE_OS_VERSION_MAX_ALLOWED >= __IPHONE_15_0
980972 int firstDimmedDetentIndex = _sheetAllowedDetents.count ;
981973
982974 // Whether we use system (iOS 15) detents or custom (iOS 16+).
@@ -990,8 +982,7 @@ - (void)updateFormSheetPresentationStyle
990982 return ;
991983 }
992984 sheet.delegate = self;
993- #if defined(__IPHONE_OS_VERSION_MAX_ALLOWED) && defined(__IPHONE_16_0) && \
994- __IPHONE_OS_VERSION_MAX_ALLOWED >= __IPHONE_16_0
985+ #if RNS_IPHONE_OS_VERSION_AVAILABLE(16_0)
995986 if (@available (iOS 16.0 , *)) {
996987 if (_sheetAllowedDetents.count > 0 ) {
997988 if (_sheetAllowedDetents.count == 1 && [_sheetAllowedDetents[0 ] integerValue ] == SHEET_FIT_TO_CONTENTS) {
@@ -1052,8 +1043,7 @@ - (void)updateFormSheetPresentationStyle
10521043 // Handle initial detent on the first update.
10531044 if (!_sheetHasInitialDetentSet) {
10541045 if (_sheetInitialDetent > 0 && _sheetInitialDetent < _sheetAllowedDetents.count ) {
1055- #if defined(__IPHONE_OS_VERSION_MAX_ALLOWED) && defined(__IPHONE_16_0) && \
1056- __IPHONE_OS_VERSION_MAX_ALLOWED >= __IPHONE_16_0
1046+ #if RNS_IPHONE_OS_VERSION_AVAILABLE(16_0)
10571047 if (@available (iOS 16.0 , *)) {
10581048 UISheetPresentationControllerDetent *detent = sheet.detents [_sheetInitialDetent];
10591049 [self setSelectedDetentForSheet: sheet to: detent.identifier animate: YES ];
@@ -1111,11 +1101,9 @@ - (void)updateFormSheetPresentationStyle
11111101 // out.
11121102 [self ->_contentWrapperBox.contentWrapper triggerDelegateUpdate ];
11131103#endif // RCT_NEW_ARCH_ENABLED
1114- #endif // Check for iOS >= 15
11151104}
11161105
1117- #if defined(__IPHONE_OS_VERSION_MAX_ALLOWED) && defined(__IPHONE_16_0) && \
1118- __IPHONE_OS_VERSION_MAX_ALLOWED >= __IPHONE_16_0
1106+ #if RNS_IPHONE_OS_VERSION_AVAILABLE(16_0)
11191107
11201108/* *
11211109 * Creates array of detent objects based on provided `values` & `resolver`. Since we need to name the detents to be able
0 commit comments