💫 Update: Header Imports

dominicstop · Dec 12, 2024 · 2440da1 · 2440da1
1 parent 9049c33
commit 2440da1
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 3 deletions.
diff --git a/ios/RNIModalSheetView/RNIModalSheetView.h b/ios/RNIModalSheetView/RNIModalSheetView.h
@@ -5,7 +5,11 @@
 //  Created by Dominic Go on 6/6/24.
 //
 
+#if __has_include(<react_native_ios_utilities/RNIBaseView.h>)
 #import <react_native_ios_utilities/RNIBaseView.h>
+#else
+#import <react-native-ios-utilities/RNIBaseView.h>
+#endif
 
 #if RCT_NEW_ARCH_ENABLED
 #import <React/RCTViewComponentView.h>

diff --git a/ios/RNIModalSheetView/RNIModalSheetView.mm b/ios/RNIModalSheetView/RNIModalSheetView.mm
@@ -6,19 +6,30 @@
 //
 
 #import "RNIModalSheetView.h"
-
 #import "../Swift.h"
+
+#if __has_include(<react_native_ios_utilities/RNIBaseView.h>)
 #import <react_native_ios_utilities/RNIBaseView.h>
 #import <react_native_ios_utilities/RNIContentViewParentDelegate.h>
-
 #import <react_native_ios_utilities/UIApplication+RNIHelpers.h>
 #import <react_native_ios_utilities/RNIObjcUtils.h>
+#else
+#import <react-native-ios-utilities/RNIBaseView.h>
+#import <react-native-ios-utilities/RNIContentViewParentDelegate.h>
+#import <react-native-ios-utilities/UIApplication+RNIHelpers.h>
+#import <react-native-ios-utilities/RNIObjcUtils.h>
+#endif
 
 #if RCT_NEW_ARCH_ENABLED
 #include "RNIModalSheetViewComponentDescriptor.h"
 
+#if __has_include(<react_native_ios_utilities/RNIBaseViewState.h>)
 #include <react_native_ios_utilities/RNIBaseViewState.h>
 #include <react_native_ios_utilities/RNIBaseViewProps.h>
+#else
+#include <react-native-ios-utilities/RNIBaseViewState.h>
+#include <react-native-ios-utilities/RNIBaseViewProps.h>
+#endif
 
 #import <React/RCTConversions.h>
 #import <React/RCTFabricComponentsPlugins.h>

diff --git a/ios/RNIModalSheetView/RNIModalSheetViewManager.mm b/ios/RNIModalSheetView/RNIModalSheetViewManager.mm
@@ -12,7 +12,11 @@
 #import <React/RCTViewManager.h>
 #import <React/RCTUIManager.h>
 
+#if __has_include(<react_native_ios_utilities/RNIBaseViewUtils.h>)
 #import <react_native_ios_utilities/RNIBaseViewUtils.h>
+#else
+#import <react-native-ios-utilities/RNIBaseViewUtils.h>
+#endif
 
 
 @interface RNIModalSheetViewManager : RCTViewManager

diff --git a/ios/Swift.h b/ios/Swift.h
@@ -10,11 +10,14 @@
 // Otherwise, it's available only locally with double-quoted imports.
 #if __has_include(<react_native_ios_modal/react_native_ios_modal-Swift.h>)
 #import <react_native_ios_modal/react_native_ios_modal-Swift.h>
+
+#elif __has_include(<react-native-ios-modal/react_native_ios_modal-Swift.h>)
+#import <react-native-ios-modal/react_native_ios_modal-Swift.h>
+
 #else
 #import "react_native_ios_modal-Swift.h"
 #endif
 
-
 // #import <react-native-ios-utilities/react-native-ios-utilities-Swift.h>
 // #import "<react_native_ios_utilities/react_native_ios_utilities-Swift.h>"
 // #import <react-native-ios-utilities/react_native_ios_utilities-Swift.h>