refactor: clean up imports with macro

dominicstop · Dec 15, 2024 · 8dbac1d · 8dbac1d
1 parent 571e7fd
commit 8dbac1d
Show file tree

Hide file tree

Showing 12 changed files with 51 additions and 48 deletions.
diff --git a/ios/RNIContextMenuButton/RNIContextMenuButton.h b/ios/RNIContextMenuButton/RNIContextMenuButton.h
@@ -5,9 +5,9 @@
 //  Created by Dominic Go on 8/24/24.
 //
 
-#import "RNIHeaderUtils.h"
+#import "../RNIHeaderUtils.h"
 
-RNI_INCLUDE_HEADER(RNIBaseView.h)
+#import RNI_INCLUDE_HEADER(RNIBaseView.h)
 
 #if RCT_NEW_ARCH_ENABLED
 #import <React/RCTViewComponentView.h>

diff --git a/ios/RNIContextMenuButton/RNIContextMenuButton.mm b/ios/RNIContextMenuButton/RNIContextMenuButton.mm
@@ -7,16 +7,16 @@
 
 #import "RNIContextMenuButton.h"
 #import "../Swift.h"
-#import "RNIHeaderUtils.h"
+#import "../RNIHeaderUtils.h"
 
-RNI_INCLUDE_HEADER(RNIContentViewParentDelegate.h)
-RNI_INCLUDE_HEADER(UIApplication+RNIHelpers.h)
-RNI_INCLUDE_HEADER(RNIObjcUtils.h)
+#import RNI_INCLUDE_HEADER(RNIContentViewParentDelegate.h)
+#import RNI_INCLUDE_HEADER(UIApplication+RNIHelpers.h)
+#import RNI_INCLUDE_HEADER(RNIObjcUtils.h)
 
 #if RCT_NEW_ARCH_ENABLED
 #include "RNIContextMenuButtonComponentDescriptor.h"
-RNI_INCLUDE_HEADER(RNIBaseViewState.h)
-RNI_INCLUDE_HEADER(RNIBaseViewProps.h)
+#import RNI_INCLUDE_HEADER(RNIBaseViewState.h)
+#import RNI_INCLUDE_HEADER(RNIBaseViewProps.h)
 
 #import <React/RCTConversions.h>
 #import <React/RCTFabricComponentsPlugins.h>

diff --git a/ios/RNIContextMenuButton/RNIContextMenuButtonComponentDescriptor.h b/ios/RNIContextMenuButton/RNIContextMenuButtonComponentDescriptor.h
@@ -10,9 +10,9 @@
 
 #include "RNIContextMenuButtonShadowNode.h"
 #include "RNIBaseViewComponentDescriptor.h"
-#include "RNIHeaderUtils.h"
+#include "../RNIHeaderUtils.h"
 
-RNI_INCLUDE_HEADER(RNIBaseViewState.h)
+#import RNI_INCLUDE_HEADER(RNIBaseViewState.h)
 
 #include <react/renderer/core/ConcreteComponentDescriptor.h>
 

diff --git a/ios/RNIContextMenuButton/RNIContextMenuButtonShadowNode.h b/ios/RNIContextMenuButton/RNIContextMenuButtonShadowNode.h
@@ -8,11 +8,11 @@
 #if __cplusplus
 #pragma once
 
-#include "RNIHeaderUtils.h"
+#include "../RNIHeaderUtils.h"
 
-RNI_INCLUDE_HEADER(RNIBaseViewShadowNode.h)
-RNI_INCLUDE_HEADER(RNIBaseViewProps.h)
-RNI_INCLUDE_HEADER(RNIBaseViewEventEmitter.h)
+#import RNI_INCLUDE_HEADER(RNIBaseViewShadowNode.h)
+#import RNI_INCLUDE_HEADER(RNIBaseViewProps.h)
+#import RNI_INCLUDE_HEADER(RNIBaseViewEventEmitter.h)
 
 #include <react/renderer/components/RNIContextMenuViewSpec/EventEmitters.h>
 #include <react/renderer/components/RNIContextMenuViewSpec/Props.h>

diff --git a/ios/RNIContextMenuButton/RNIContextMenuButtonViewManager.mm b/ios/RNIContextMenuButton/RNIContextMenuButtonViewManager.mm
@@ -8,9 +8,9 @@
 #import "RNIContextMenuButton.h"
 #import <objc/runtime.h>
 
-#import "RNIHeaderUtils.h"
+#import "../RNIHeaderUtils.h"
 
-RNI_INCLUDE_HEADER(RNIBaseViewUtils.h)
+#import RNI_INCLUDE_HEADER(RNIBaseViewUtils.h)
 
 #import "RCTBridge.h"
 #import <React/RCTViewManager.h>

diff --git a/ios/RNIContextMenuView/RNIContextMenuView.h b/ios/RNIContextMenuView/RNIContextMenuView.h
@@ -5,9 +5,9 @@
 //  Created by Dominic Go on 8/24/24.
 //
 
-#import "RNIHeaderUtils.h"
+#import "../RNIHeaderUtils.h"
 
-RNI_INCLUDE_HEADER(RNIBaseView.h)
+#import RNI_INCLUDE_HEADER(RNIBaseView.h)
 
 #if RCT_NEW_ARCH_ENABLED
 #import <React/RCTViewComponentView.h>

diff --git a/ios/RNIContextMenuView/RNIContextMenuView.mm b/ios/RNIContextMenuView/RNIContextMenuView.mm
@@ -7,27 +7,23 @@
 
 #import "RNIContextMenuView.h"
 #import "../Swift.h"
-#import "RNIHeaderUtils.h"
 
-RNI_INCLUDE_HEADER(RNIBaseView.h)
-RNI_INCLUDE_HEADER(RNIContentViewParentDelegate.h)
-RNI_INCLUDE_HEADER(UIApplication+RNIHelpers.h)
-RNI_INCLUDE_HEADER(RNIObjcUtils.h)
+#import "../RNIHeaderUtils.h"
+
+#import RNI_INCLUDE_HEADER(RNIBaseView.h)
+#import RNI_INCLUDE_HEADER(RNIContentViewParentDelegate.h)
+#import RNI_INCLUDE_HEADER(UIApplication+RNIHelpers.h)
+#import RNI_INCLUDE_HEADER(RNIObjcUtils.h)
 
 #if RCT_NEW_ARCH_ENABLED
-RNI_INCLUDE_HEADER(RNIBaseViewState.h)
-#else
-RNI_INCLUDE_HEADER(RNIBaseView.h)
-RNI_INCLUDE_HEADER(RNIContentViewParentDelegate.h)
-RNI_INCLUDE_HEADER(UIApplication+RNIHelpers.h)
-RNI_INCLUDE_HEADER(RNIObjcUtils.h)
+#import RNI_INCLUDE_HEADER(RNIBaseViewState.h)
 #endif
 
 #if RCT_NEW_ARCH_ENABLED
 #include "RNIContextMenuViewComponentDescriptor.h"
 
-RNI_INCLUDE_HEADER(RNIBaseViewState.h)
-RNI_INCLUDE_HEADER(RNIBaseViewProps.h)
+#import RNI_INCLUDE_HEADER(RNIBaseViewState.h)
+#import RNI_INCLUDE_HEADER(RNIBaseViewProps.h)
 
 #import <React/RCTConversions.h>
 #import <React/RCTFabricComponentsPlugins.h>

diff --git a/ios/RNIContextMenuView/RNIContextMenuViewManager.mm b/ios/RNIContextMenuView/RNIContextMenuViewManager.mm
@@ -7,9 +7,10 @@
 
 #import "RNIContextMenuView.h"
 #import <objc/runtime.h>
-#import "RNIHeaderUtils.h"
 
-RNI_INCLUDE_HEADER(RNIBaseViewUtils.h)
+#import "../RNIHeaderUtils.h"
+
+#import RNI_INCLUDE_HEADER(RNIBaseViewUtils.h)
 
 #import "RCTBridge.h"
 #import <React/RCTViewManager.h>

diff --git a/ios/RNIContextMenuView/RNIContextMenuViewShadowNode.h b/ios/RNIContextMenuView/RNIContextMenuViewShadowNode.h
@@ -8,11 +8,11 @@
 #if __cplusplus
 #pragma once
 
-#include "RNIHeaderUtils.h"
+#include "../RNIHeaderUtils.h"
 
-RNI_INCLUDE_HEADER(RNIBaseViewShadowNode.h)
-RNI_INCLUDE_HEADER(RNIBaseViewProps.h)
-RNI_INCLUDE_HEADER(RNIBaseViewEventEmitter.h)
+#import RNI_INCLUDE_HEADER(RNIBaseViewShadowNode.h)
+#import RNI_INCLUDE_HEADER(RNIBaseViewProps.h)
+#import RNI_INCLUDE_HEADER(RNIBaseViewEventEmitter.h)
 
 #include <react/renderer/components/RNIContextMenuViewSpec/EventEmitters.h>
 #include <react/renderer/components/RNIContextMenuViewSpec/Props.h>

diff --git a/ios/RNIHeaderUtils.h b/ios/RNIHeaderUtils.h
@@ -1,8 +1,7 @@
 #pragma once
 
-#define RNI_INCLUDE_HEADER(header) \
-#if __has_include(<react_native_ios_utilities/header>) \
-#include <react_native_ios_utilities/header> \
-#else \
-#include <react-native-ios-utilities/header> \
+#if __has_include(<react_native_ios_utilities/header>)
+    #define RNI_INCLUDE_HEADER(header) <react_native_ios_utilities/header>
+#else
+    #define RNI_INCLUDE_HEADER(header) <react-native-ios-utilities/header>
 #endif
diff --git a/ios/Swift.h b/ios/Swift.h
@@ -4,9 +4,16 @@
 //
 //  Created by Dominic Go on 8/24/24.
 //
-#import "RNIHeaderUtils.h"
+#if __has_include(<react_native_ios_context_menu/react_native_ios_context_menu-Swift.h>)
+#import <react_native_ios_context_menu/react_native_ios_context_menu-Swift.h>
+
+#elif __has_include(<react-native-ios-context-menu/react_native_ios_context_menu-Swift.h>)
+#import <react-native-ios-context-menu/react_native_ios_context_menu-Swift.h>
+
+#else
+#import "react_native_ios_context_menu-Swift.h"
+#endif
 
-RNI_INCLUDE_HEADER(react_native_ios_context_menu-Swift.h)
 
 // #import <react-native-ios-utilities/react-native-ios-utilities-Swift.h>
 // #import "<react_native_ios_utilities/react_native_ios_utilities-Swift.h>"

diff --git a/react-native-ios-context-menu.podspec b/react-native-ios-context-menu.podspec
@@ -68,15 +68,15 @@ Pod::Spec.new do |s|
     '"${PODS_CONFIGURATION_BUILD_DIR}/react-native-ios-utilities/**"',
     '"${PODS_CONFIGURATION_BUILD_DIR}/react-native-ios-utilities/Swift Compatibility Header"',
     '"${PODS_CONFIGURATION_BUILD_DIR}/react-native-ios-context-menu/Swift Compatibility Header"',
-    
+
     #'"$(PODS_ROOT)/Headers/Private/react-native-ios-utilities"',
     #'"$(PODS_ROOT)/Headers/Public/react-native-ios-utilities"',
 
     '"$(PODS_ROOT)/Headers/Private/React-bridging/react/bridging"',
     '"$(PODS_CONFIGURATION_BUILD_DIR)/React-bridging/react_bridging.framework/Headers"',
     '"$(PODS_ROOT)/Headers/Private/Yoga"',
   ]
-  
+
   if fabric_enabled && ENV['USE_FRAMEWORKS']
     user_header_search_paths << "\"$(PODS_ROOT)/DoubleConversion\""
     user_header_search_paths << "\"${PODS_CONFIGURATION_BUILD_DIR}/React-graphics/React_graphics.framework/Headers\""
@@ -91,7 +91,7 @@ Pod::Spec.new do |s|
     "HEADER_SEARCH_PATHS" => user_header_search_paths,
   }
 
-  # s.xcconfig = { 
+  # s.xcconfig = {
   #   'HEADER_SEARCH_PATHS' => [
   #     '"${PODS_CONFIGURATION_BUILD_DIR}/react-native-ios-utilities/Swift Compatibility Header"',
   #     '"${PODS_CONFIGURATION_BUILD_DIR}/react-native-ios-utilities/**"',
@@ -138,5 +138,5 @@ Pod::Spec.new do |s|
 
   s.exclude_files = exclude_files
   s.compiler_flags = compiler_flags
-  s.private_header_files = ['ios/**/*+Private.h', 'ios/**/Swift.h']
+  s.private_header_files = ['ios/**/*+Private.h', 'ios/**/Swift.h', 'ios/**/RNIHeaderUtils.h']
 end