Skip to content

Commit 6b3ff22

Browse files
coolsoftwaretylerdominicstop
authored andcommitted
fix: import paths for frameworks
1 parent 2bee6d7 commit 6b3ff22

File tree

7 files changed

+49
-1
lines changed

7 files changed

+49
-1
lines changed

ios/RNIContextMenuButton/RNIContextMenuButton.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,11 @@
55
// Created by Dominic Go on 8/24/24.
66
//
77

8+
#if __has_include(<react_native_ios_utilities/RNIBaseView.h>)
9+
#import <react_native_ios_utilities/RNIBaseView.h>
10+
#else
811
#import <react-native-ios-utilities/RNIBaseView.h>
12+
#endif
913

1014
#if RCT_NEW_ARCH_ENABLED
1115
#import <React/RCTViewComponentView.h>

ios/RNIContextMenuButton/RNIContextMenuButton.mm

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,18 +7,33 @@
77

88
#import "RNIContextMenuButton.h"
99

10+
#if __has_include(<react_native_ios_context_menu/Swift.h>)
11+
#import "react_native_ios_context_menu/Swift.h"
12+
13+
#import <react_native_ios_utilities/RNIBaseView.h>
14+
#import <react_native_ios_utilities//RNIContentViewParentDelegate.h>
15+
#import <react_native_ios_utilities/UIApplication+RNIHelpers.h>
16+
#import <react_native_ios_utilities/RNIObjcUtils.h>
17+
18+
#else
1019
#import "react-native-ios-context-menu/Swift.h"
1120

1221
#import <react-native-ios-utilities/RNIBaseView.h>
1322
#import <react-native-ios-utilities/RNIContentViewParentDelegate.h>
1423
#import <react-native-ios-utilities/UIApplication+RNIHelpers.h>
1524
#import <react-native-ios-utilities/RNIObjcUtils.h>
25+
#endif
1626

1727
#if RCT_NEW_ARCH_ENABLED
1828
#include "RNIContextMenuButtonComponentDescriptor.h"
1929

30+
#if __has_include(<react_native_ios_utilities/RNIBaseViewState)
31+
#include <react_native_ios_utilities/RNIBaseViewState.h>
32+
#include <react_native_ios_utilities/RNIBaseViewProps.h>
33+
#else
2034
#include <react-native-ios-utilities/RNIBaseViewState.h>
2135
#include <react-native-ios-utilities/RNIBaseViewProps.h>
36+
#endif
2237

2338
#import <React/RCTConversions.h>
2439
#import <React/RCTFabricComponentsPlugins.h>

ios/RNIContextMenuButton/RNIContextMenuButtonViewManager.mm

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,12 @@
88
#import "RNIContextMenuButton.h"
99
#import <objc/runtime.h>
1010

11+
#if __has_include(<react_native_ios_utilities/RNIBaseViewUtils.h>)
12+
#import <react_native_ios_utilities/RNIBaseViewUtils.h>
13+
14+
#else
1115
#import <react-native-ios-utilities/RNIBaseViewUtils.h>
16+
#endif
1217

1318
#import "RCTBridge.h"
1419
#import <React/RCTViewManager.h>

ios/RNIContextMenuView/RNIContextMenuView.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,11 @@
55
// Created by Dominic Go on 8/24/24.
66
//
77

8+
#if __has_include(<react_native_ios_utilities/RNIBaseView.h>)
9+
#import <react_native_ios_utilities/RNIBaseView.h>
10+
#else
811
#import <react-native-ios-utilities/RNIBaseView.h>
12+
#endif
913

1014
#if RCT_NEW_ARCH_ENABLED
1115
#import <React/RCTViewComponentView.h>

ios/RNIContextMenuView/RNIContextMenuView.mm

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,18 +7,33 @@
77

88
#import "RNIContextMenuView.h"
99

10+
#if __has_include(<react_native_ios_context_menu/Swift.h>)
11+
#import "react_native_ios_context_menu/Swift.h"
12+
13+
#import <react_native_ios_utilities/RNIBaseView.h>
14+
#import <react_native_ios_utilities/RNIContentViewParentDelegate.h>
15+
#import <react_native_ios_utilities/UIApplication+RNIHelpers.h>
16+
#import <react_native_ios_utilities/RNIObjcUtils.h>
17+
#else
1018
#import "react-native-ios-context-menu/Swift.h"
1119

1220
#import <react-native-ios-utilities/RNIBaseView.h>
1321
#import <react-native-ios-utilities/RNIContentViewParentDelegate.h>
1422
#import <react-native-ios-utilities/UIApplication+RNIHelpers.h>
1523
#import <react-native-ios-utilities/RNIObjcUtils.h>
24+
#endif
1625

1726
#if RCT_NEW_ARCH_ENABLED
1827
#include "RNIContextMenuViewComponentDescriptor.h"
1928

29+
#if __has_include(<react_native_ios_utilities/RNIBaseViewState.h>)
30+
#include <react_native_ios_utilities/RNIBaseViewState.h>
31+
#include <react_native_ios_utilities/RNIBaseViewProps.h>
32+
33+
#else
2034
#include <react-native-ios-utilities/RNIBaseViewState.h>
2135
#include <react-native-ios-utilities/RNIBaseViewProps.h>
36+
#endif
2237

2338
#import <React/RCTConversions.h>
2439
#import <React/RCTFabricComponentsPlugins.h>

ios/RNIContextMenuView/RNIContextMenuViewManager.mm

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,12 @@
88
#import "RNIContextMenuView.h"
99
#import <objc/runtime.h>
1010

11+
#if __has_include(<react_native_ios_utilities/RNIBaseViewUtils.h>)
12+
#import <react_native_ios_utilities/RNIBaseViewUtils.h>
13+
14+
#else
1115
#import <react-native-ios-utilities/RNIBaseViewUtils.h>
16+
#endif
1217

1318
#import "RCTBridge.h"
1419
#import <React/RCTViewManager.h>

ios/Swift.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
// the module.
1010
// Otherwise, it's available only locally with double-quoted imports.
1111
#if __has_include(<react_native_ios_context_menu/react_native_ios_context_menu-Swift.h>)
12-
#import "<react_native_ios_context_menu/react_native_ios_context_menu-Swift.h>"
12+
#import <react_native_ios_context_menu/react_native_ios_context_menu-Swift.h>
1313
#else
1414
#import "react_native_ios_context_menu-Swift.h"
1515
#endif

0 commit comments

Comments
 (0)