Skip to content

Commit dbfb2f4

Browse files
mfazekasclaude
andauthored
chore(ios): remove old architecture code (#4130)
* chore(ios): remove old architecture code Remove React Native old architecture (Paper/Bridge) code from iOS, keeping only new architecture (Fabric/TurboModules) code. Changes: - Delete all *ViewManager.m and *ViewManager.swift files (old arch view managers) - Remove #ifdef RCT_NEW_ARCH_ENABLED guards from ComponentView files - Simplify Module.h files to only conform to TurboModule protocols - Remove old arch conditionals from Module.mm files - Update RNMBXViewResolver to remove old arch code paths - Remove unused RCTViewManager imports from Bridge/RNMBX.h and Swift.pre.h - Remove guards from RNMBXFabricPropConvert.mm and RNMBXFollyConvert.h This is a follow-up to the Android old architecture removal (#4128) and continues the 10.3.0 cleanup work (#4118). * fix(ios): add __cplusplus guard to ComponentView.h files The umbrella header is compiled as Objective-C (not Objective-C++), which causes errors when ComponentView.h files import Fabric headers that transitively include C++ code like <atomic>. Use #ifdef __cplusplus guard instead of RCT_NEW_ARCH_ENABLED to: - Allow content when compiled as Objective-C++ (.mm files) - Hide content when compiled as Objective-C (umbrella header) * fix(ios): add module wrapper methods to RNMBXMapView Move 16 module methods from static RNMBXMapViewManager methods to instance methods on RNMBXMapView, fixing build errors after old architecture removal. * fix(ios): restructure Module.h files for Swift compilation Move Foundation/UIKit imports outside __cplusplus guard and provide plain NSObject interface for non-C++ contexts (Swift). * fix(ios): add module wrapper methods to RNMBXViewport and RNMBXShapeSource Call methods directly on view instances instead of through Manager classes. --------- Co-authored-by: Claude <noreply@anthropic.com>
1 parent 89ebfd9 commit dbfb2f4

File tree

156 files changed

+497
-1680
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

156 files changed

+497
-1680
lines changed

ios/RNMBX/Bridge/RNMBX.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
/* Those will be available for Swift */
22
#import <React/RCTEventEmitter.h>
3-
#import <React/RCTViewManager.h>
43
#import <React/RCTImageLoaderProtocol.h>
54
#import <React/RCTUIManager.h>
65

ios/RNMBX/RNMBXAtmosphereComponentView.h

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#ifdef RCT_NEW_ARCH_ENABLED
1+
#ifdef __cplusplus
22

33
#import <UIKit/UIKit.h>
44

@@ -11,5 +11,4 @@ NS_ASSUME_NONNULL_BEGIN
1111
@end
1212

1313
NS_ASSUME_NONNULL_END
14-
15-
#endif // RCT_NEW_ARCH_ENABLED
14+
#endif // __cplusplus

ios/RNMBX/RNMBXAtmosphereComponentView.mm

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
#ifdef RCT_NEW_ARCH_ENABLED
21

32
#import "RNMBXAtmosphereComponentView.h"
43
#import "RNMBXFabricHelpers.h"
@@ -79,4 +78,3 @@ - (void)prepareForRecycle
7978
return RNMBXAtmosphereComponentView.class;
8079
}
8180

82-
#endif // RCT_NEW_ARCH_ENABLED

ios/RNMBX/RNMBXAtmosphereViewManager.m

Lines changed: 0 additions & 8 deletions
This file was deleted.

ios/RNMBX/RNMBXAtmosphereViewManager.swift

Lines changed: 0 additions & 13 deletions
This file was deleted.

ios/RNMBX/RNMBXBackgroundLayerComponentView.h

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#ifdef RCT_NEW_ARCH_ENABLED
1+
#ifdef __cplusplus
22

33
#import <UIKit/UIKit.h>
44

@@ -11,5 +11,4 @@ NS_ASSUME_NONNULL_BEGIN
1111
@end
1212

1313
NS_ASSUME_NONNULL_END
14-
15-
#endif // RCT_NEW_ARCH_ENABLED
14+
#endif // __cplusplus

ios/RNMBX/RNMBXBackgroundLayerComponentView.mm

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
#ifdef RCT_NEW_ARCH_ENABLED
21

32
#import "RNMBXBackgroundLayerComponentView.h"
43
#import "RNMBXFabricHelpers.h"
@@ -74,4 +73,3 @@ - (void)prepareForRecycle
7473
return RNMBXBackgroundLayerComponentView.class;
7574
}
7675

77-
#endif // RCT_NEW_ARCH_ENABLED

ios/RNMBX/RNMBXBackgroundLayerViewManager.m

Lines changed: 0 additions & 9 deletions
This file was deleted.

ios/RNMBX/RNMBXBackgroundLayerViewManager.swift

Lines changed: 0 additions & 13 deletions
This file was deleted.

ios/RNMBX/RNMBXCalloutComponentView.h

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#ifdef RCT_NEW_ARCH_ENABLED
1+
#ifdef __cplusplus
22

33
#import <UIKit/UIKit.h>
44

@@ -11,5 +11,4 @@ NS_ASSUME_NONNULL_BEGIN
1111
@end
1212

1313
NS_ASSUME_NONNULL_END
14-
15-
#endif // RCT_NEW_ARCH_ENABLED
14+
#endif // __cplusplus

0 commit comments

Comments
 (0)