Skip to content

Commit ea93151

Browse files
luluwu2032facebook-github-bot
authored andcommitted
Make RCTEventDispatcher TurboModule-compatible
Summary: This diff ended up being a bit more complicated than I anticipated, since the source files in `ReactInternal` were depending on `RCTEventDispatcher`. I made the following changes: 1. Make `RCTEventDispatcher` a `protocol`, keep it in `ReactInternal`. 2. Rename the `RCTEventDispatcher` NativeModule to `RCTEventDispatcherModule`, make it conform to the `RCTEventEmitter` `protocol`, and move it to `CoreModules`. 3. Where necessary, replace categories of `RCTEventDispatcher` with functions. Changelog: [iOS][Added] - Make RCTEventDispatcher TurboModule-comaptible Reviewed By: fkgozali Differential Revision: D18439488 fbshipit-source-id: b3da15c29459fddf884519f33b0c3b8c036b5539
1 parent d5076c6 commit ea93151

Some content is hidden

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

46 files changed

+301
-284
lines changed

Libraries/Image/RCTImageView.mm

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99

1010
#import <React/RCTBridge.h>
1111
#import <React/RCTConvert.h>
12-
#import <React/RCTEventDispatcher.h>
1312
#import <React/RCTImageBlurUtils.h>
1413
#import <React/RCTImageSource.h>
1514
#import <React/RCTImageUtils.h>

Libraries/LinkingIOS/RCTLinkingManager.mm

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99

1010
#import <FBReactNativeSpec/FBReactNativeSpec.h>
1111
#import <React/RCTBridge.h>
12-
#import <React/RCTEventDispatcher.h>
1312
#import <React/RCTUtils.h>
1413
#import <React/RCTLog.h>
1514

Libraries/NativeAnimation/Drivers/RCTEventAnimation.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* LICENSE file in the root directory of this source tree.
66
*/
77

8-
#import <React/RCTEventDispatcher.h>
8+
#import <React/RCTEventDispatcherProtocol.h>
99

1010
#import "RCTValueAnimatedNode.h"
1111

Libraries/NativeAnimation/RCTNativeAnimatedModule.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
*/
77

88
#import <React/RCTBridgeModule.h>
9-
#import <React/RCTEventDispatcher.h>
9+
#import <React/RCTEventDispatcherProtocol.h>
1010
#import <React/RCTEventEmitter.h>
1111
#import <React/RCTSurfacePresenterStub.h>
1212
#import <React/RCTUIManager.h>

Libraries/NativeAnimation/RCTNativeAnimatedNodesManager.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
#import <React/RCTBridgeModule.h>
1010
#import <React/RCTUIManager.h>
1111
#import <React/RCTSurfacePresenterStub.h>
12+
#import <React/RCTEventDispatcherProtocol.h>
1213

1314
@protocol RCTValueAnimatedNodeObserver;
1415

Libraries/NativeAnimation/RCTNativeAnimatedTurboModule.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
*/
77

88
#import <React/RCTBridgeModule.h>
9-
#import <React/RCTEventDispatcher.h>
9+
#import <React/RCTEventDispatcherProtocol.h>
1010
#import <React/RCTEventEmitter.h>
1111
#import <React/RCTSurfacePresenterStub.h>
1212
#import <React/RCTUIManager.h>

Libraries/Network/RCTNetworking.mm

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
#import <FBReactNativeSpec/FBReactNativeSpec.h>
1212
#import <React/RCTAssert.h>
1313
#import <React/RCTConvert.h>
14-
#import <React/RCTEventDispatcher.h>
1514
#import <React/RCTLog.h>
1615
#import <React/RCTNetworkTask.h>
1716
#import <React/RCTNetworking.h>

Libraries/PushNotificationIOS/RCTPushNotificationManager.mm

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
#import <FBReactNativeSpec/FBReactNativeSpec.h>
1313
#import <React/RCTBridge.h>
1414
#import <React/RCTConvert.h>
15-
#import <React/RCTEventDispatcher.h>
1615
#import <React/RCTUtils.h>
1716

1817
#import "RCTPushNotificationPlugins.h"

Libraries/Settings/RCTSettingsManager.mm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
#import <FBReactNativeSpec/FBReactNativeSpec.h>
1111
#import <React/RCTBridge.h>
1212
#import <React/RCTConvert.h>
13-
#import <React/RCTEventDispatcher.h>
13+
#import <React/RCTEventDispatcherProtocol.h>
1414
#import <React/RCTUtils.h>
1515

1616
#import "RCTSettingsPlugins.h"

Libraries/Text/TextInput/RCTBaseTextInputView.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
#import "RCTBackedTextInputViewProtocol.h"
1414

1515
@class RCTBridge;
16-
@class RCTEventDispatcher;
1716
@class RCTTextAttributes;
1817
@class RCTTextSelection;
1918

0 commit comments

Comments
 (0)