diff --git a/Libraries/FBReactNativeSpec/FBReactNativeSpec/FBReactNativeSpec-generated.mm b/Libraries/FBReactNativeSpec/FBReactNativeSpec/FBReactNativeSpec-generated.mm index a94e7cfc4f6..051a9baf494 100644 --- a/Libraries/FBReactNativeSpec/FBReactNativeSpec/FBReactNativeSpec-generated.mm +++ b/Libraries/FBReactNativeSpec/FBReactNativeSpec/FBReactNativeSpec-generated.mm @@ -36,7 +36,7 @@ namespace facebook { } - NativeAccessibilityInfoSpecJSI::NativeAccessibilityInfoSpecJSI(id instance, std::shared_ptr jsInvoker) + NativeAccessibilityInfoSpecJSI::NativeAccessibilityInfoSpecJSI(id instance, std::shared_ptr jsInvoker) : ObjCTurboModule("AccessibilityInfo", instance, jsInvoker) { methodMap_["isReduceMotionEnabled"] = MethodMetadata {1, __hostFunction_NativeAccessibilityInfoSpecJSI_isReduceMotionEnabled}; @@ -103,7 +103,7 @@ namespace facebook { } - NativeAccessibilityManagerSpecJSI::NativeAccessibilityManagerSpecJSI(id instance, std::shared_ptr jsInvoker) + NativeAccessibilityManagerSpecJSI::NativeAccessibilityManagerSpecJSI(id instance, std::shared_ptr jsInvoker) : ObjCTurboModule("AccessibilityManager", instance, jsInvoker) { methodMap_["getCurrentBoldTextState"] = MethodMetadata {2, __hostFunction_NativeAccessibilityManagerSpecJSI_getCurrentBoldTextState}; @@ -170,7 +170,7 @@ namespace facebook { } - NativeActionSheetManagerSpecJSI::NativeActionSheetManagerSpecJSI(id instance, std::shared_ptr jsInvoker) + NativeActionSheetManagerSpecJSI::NativeActionSheetManagerSpecJSI(id instance, std::shared_ptr jsInvoker) : ObjCTurboModule("ActionSheetManager", instance, jsInvoker) { methodMap_["showActionSheetWithOptions"] = MethodMetadata {2, __hostFunction_NativeActionSheetManagerSpecJSI_showActionSheetWithOptions}; @@ -201,7 +201,7 @@ namespace facebook { } - NativeAlertManagerSpecJSI::NativeAlertManagerSpecJSI(id instance, std::shared_ptr jsInvoker) + NativeAlertManagerSpecJSI::NativeAlertManagerSpecJSI(id instance, std::shared_ptr jsInvoker) : ObjCTurboModule("AlertManager", instance, jsInvoker) { methodMap_["alertWithArgs"] = MethodMetadata {2, __hostFunction_NativeAlertManagerSpecJSI_alertWithArgs}; @@ -314,7 +314,7 @@ namespace facebook { } - NativeAnimatedModuleSpecJSI::NativeAnimatedModuleSpecJSI(id instance, std::shared_ptr jsInvoker) + NativeAnimatedModuleSpecJSI::NativeAnimatedModuleSpecJSI(id instance, std::shared_ptr jsInvoker) : ObjCTurboModule("AnimatedModule", instance, jsInvoker) { methodMap_["createAnimatedNode"] = MethodMetadata {2, __hostFunction_NativeAnimatedModuleSpecJSI_createAnimatedNode}; @@ -392,7 +392,7 @@ namespace facebook { } - NativeAnimationsDebugModuleSpecJSI::NativeAnimationsDebugModuleSpecJSI(id instance, std::shared_ptr jsInvoker) + NativeAnimationsDebugModuleSpecJSI::NativeAnimationsDebugModuleSpecJSI(id instance, std::shared_ptr jsInvoker) : ObjCTurboModule("AnimationsDebugModule", instance, jsInvoker) { methodMap_["startRecordingFps"] = MethodMetadata {0, __hostFunction_NativeAnimationsDebugModuleSpecJSI_startRecordingFps}; @@ -433,7 +433,7 @@ namespace facebook { } - NativeAppStateSpecJSI::NativeAppStateSpecJSI(id instance, std::shared_ptr jsInvoker) + NativeAppStateSpecJSI::NativeAppStateSpecJSI(id instance, std::shared_ptr jsInvoker) : ObjCTurboModule("AppState", instance, jsInvoker) { methodMap_["getCurrentAppState"] = MethodMetadata {2, __hostFunction_NativeAppStateSpecJSI_getCurrentAppState}; @@ -470,7 +470,7 @@ namespace facebook { } - NativeAppearanceSpecJSI::NativeAppearanceSpecJSI(id instance, std::shared_ptr jsInvoker) + NativeAppearanceSpecJSI::NativeAppearanceSpecJSI(id instance, std::shared_ptr jsInvoker) : ObjCTurboModule("Appearance", instance, jsInvoker) { methodMap_["getColorScheme"] = MethodMetadata {0, __hostFunction_NativeAppearanceSpecJSI_getColorScheme}; @@ -581,7 +581,7 @@ namespace facebook { } - NativeAsyncStorageSpecJSI::NativeAsyncStorageSpecJSI(id instance, std::shared_ptr jsInvoker) + NativeAsyncStorageSpecJSI::NativeAsyncStorageSpecJSI(id instance, std::shared_ptr jsInvoker) : ObjCTurboModule("AsyncStorage", instance, jsInvoker) { methodMap_["multiGet"] = MethodMetadata {2, __hostFunction_NativeAsyncStorageSpecJSI_multiGet}; @@ -640,7 +640,7 @@ namespace facebook { } - NativeBlobModuleSpecJSI::NativeBlobModuleSpecJSI(id instance, std::shared_ptr jsInvoker) + NativeBlobModuleSpecJSI::NativeBlobModuleSpecJSI(id instance, std::shared_ptr jsInvoker) : ObjCTurboModule("BlobModule", instance, jsInvoker) { methodMap_["addNetworkingHandler"] = MethodMetadata {0, __hostFunction_NativeBlobModuleSpecJSI_addNetworkingHandler}; @@ -686,7 +686,7 @@ namespace facebook { } - NativeBugReportingSpecJSI::NativeBugReportingSpecJSI(id instance, std::shared_ptr jsInvoker) + NativeBugReportingSpecJSI::NativeBugReportingSpecJSI(id instance, std::shared_ptr jsInvoker) : ObjCTurboModule("BugReporting", instance, jsInvoker) { methodMap_["startReportAProblemFlow"] = MethodMetadata {0, __hostFunction_NativeBugReportingSpecJSI_startReportAProblemFlow}; @@ -716,7 +716,7 @@ namespace facebook { } - NativeClipboardSpecJSI::NativeClipboardSpecJSI(id instance, std::shared_ptr jsInvoker) + NativeClipboardSpecJSI::NativeClipboardSpecJSI(id instance, std::shared_ptr jsInvoker) : ObjCTurboModule("Clipboard", instance, jsInvoker) { methodMap_["getString"] = MethodMetadata {0, __hostFunction_NativeClipboardSpecJSI_getString}; @@ -739,7 +739,7 @@ namespace facebook { } - NativeDatePickerAndroidSpecJSI::NativeDatePickerAndroidSpecJSI(id instance, std::shared_ptr jsInvoker) + NativeDatePickerAndroidSpecJSI::NativeDatePickerAndroidSpecJSI(id instance, std::shared_ptr jsInvoker) : ObjCTurboModule("DatePickerAndroid", instance, jsInvoker) { methodMap_["open"] = MethodMetadata {1, __hostFunction_NativeDatePickerAndroidSpecJSI_open}; @@ -763,7 +763,7 @@ namespace facebook { } - NativeDevLoadingViewSpecJSI::NativeDevLoadingViewSpecJSI(id instance, std::shared_ptr jsInvoker) + NativeDevLoadingViewSpecJSI::NativeDevLoadingViewSpecJSI(id instance, std::shared_ptr jsInvoker) : ObjCTurboModule("DevLoadingView", instance, jsInvoker) { methodMap_["showMessage"] = MethodMetadata {3, __hostFunction_NativeDevLoadingViewSpecJSI_showMessage}; @@ -810,7 +810,7 @@ namespace facebook { } - NativeDevSettingsSpecJSI::NativeDevSettingsSpecJSI(id instance, std::shared_ptr jsInvoker) + NativeDevSettingsSpecJSI::NativeDevSettingsSpecJSI(id instance, std::shared_ptr jsInvoker) : ObjCTurboModule("DevSettings", instance, jsInvoker) { methodMap_["reload"] = MethodMetadata {0, __hostFunction_NativeDevSettingsSpecJSI_reload}; @@ -848,7 +848,7 @@ namespace facebook { } - NativeDeviceEventManagerSpecJSI::NativeDeviceEventManagerSpecJSI(id instance, std::shared_ptr jsInvoker) + NativeDeviceEventManagerSpecJSI::NativeDeviceEventManagerSpecJSI(id instance, std::shared_ptr jsInvoker) : ObjCTurboModule("DeviceEventManager", instance, jsInvoker) { methodMap_["invokeDefaultBackPressHandler"] = MethodMetadata {0, __hostFunction_NativeDeviceEventManagerSpecJSI_invokeDefaultBackPressHandler}; @@ -868,7 +868,7 @@ namespace facebook { } - NativeDeviceInfoSpecJSI::NativeDeviceInfoSpecJSI(id instance, std::shared_ptr jsInvoker) + NativeDeviceInfoSpecJSI::NativeDeviceInfoSpecJSI(id instance, std::shared_ptr jsInvoker) : ObjCTurboModule("DeviceInfo", instance, jsInvoker) { methodMap_["getConstants"] = MethodMetadata {0, __hostFunction_NativeDeviceInfoSpecJSI_getConstants}; @@ -898,7 +898,7 @@ namespace facebook { } - NativeDialogManagerAndroidSpecJSI::NativeDialogManagerAndroidSpecJSI(id instance, std::shared_ptr jsInvoker) + NativeDialogManagerAndroidSpecJSI::NativeDialogManagerAndroidSpecJSI(id instance, std::shared_ptr jsInvoker) : ObjCTurboModule("DialogManagerAndroid", instance, jsInvoker) { methodMap_["showAlert"] = MethodMetadata {3, __hostFunction_NativeDialogManagerAndroidSpecJSI_showAlert}; @@ -950,7 +950,7 @@ namespace facebook { } - NativeExceptionsManagerSpecJSI::NativeExceptionsManagerSpecJSI(id instance, std::shared_ptr jsInvoker) + NativeExceptionsManagerSpecJSI::NativeExceptionsManagerSpecJSI(id instance, std::shared_ptr jsInvoker) : ObjCTurboModule("ExceptionsManager", instance, jsInvoker) { methodMap_["reportFatalException"] = MethodMetadata {3, __hostFunction_NativeExceptionsManagerSpecJSI_reportFatalException}; @@ -987,7 +987,7 @@ namespace facebook { } - NativeFileReaderModuleSpecJSI::NativeFileReaderModuleSpecJSI(id instance, std::shared_ptr jsInvoker) + NativeFileReaderModuleSpecJSI::NativeFileReaderModuleSpecJSI(id instance, std::shared_ptr jsInvoker) : ObjCTurboModule("FileReaderModule", instance, jsInvoker) { methodMap_["readAsDataURL"] = MethodMetadata {1, __hostFunction_NativeFileReaderModuleSpecJSI_readAsDataURL}; @@ -1028,7 +1028,7 @@ namespace facebook { } - NativeFrameRateLoggerSpecJSI::NativeFrameRateLoggerSpecJSI(id instance, std::shared_ptr jsInvoker) + NativeFrameRateLoggerSpecJSI::NativeFrameRateLoggerSpecJSI(id instance, std::shared_ptr jsInvoker) : ObjCTurboModule("FrameRateLogger", instance, jsInvoker) { methodMap_["setGlobalOptions"] = MethodMetadata {1, __hostFunction_NativeFrameRateLoggerSpecJSI_setGlobalOptions}; @@ -1062,7 +1062,7 @@ namespace facebook { } - NativeHeadlessJsTaskSupportSpecJSI::NativeHeadlessJsTaskSupportSpecJSI(id instance, std::shared_ptr jsInvoker) + NativeHeadlessJsTaskSupportSpecJSI::NativeHeadlessJsTaskSupportSpecJSI(id instance, std::shared_ptr jsInvoker) : ObjCTurboModule("HeadlessJsTaskSupport", instance, jsInvoker) { methodMap_["notifyTaskFinished"] = MethodMetadata {1, __hostFunction_NativeHeadlessJsTaskSupportSpecJSI_notifyTaskFinished}; @@ -1089,7 +1089,7 @@ namespace facebook { } - NativeHeapCaptureSpecJSI::NativeHeapCaptureSpecJSI(id instance, std::shared_ptr jsInvoker) + NativeHeapCaptureSpecJSI::NativeHeapCaptureSpecJSI(id instance, std::shared_ptr jsInvoker) : ObjCTurboModule("HeapCapture", instance, jsInvoker) { methodMap_["captureHeap"] = MethodMetadata {1, __hostFunction_NativeHeapCaptureSpecJSI_captureHeap}; @@ -1124,7 +1124,7 @@ namespace facebook { } - NativeI18nManagerSpecJSI::NativeI18nManagerSpecJSI(id instance, std::shared_ptr jsInvoker) + NativeI18nManagerSpecJSI::NativeI18nManagerSpecJSI(id instance, std::shared_ptr jsInvoker) : ObjCTurboModule("I18nManager", instance, jsInvoker) { methodMap_["allowRTL"] = MethodMetadata {1, __hostFunction_NativeI18nManagerSpecJSI_allowRTL}; @@ -1149,7 +1149,7 @@ namespace facebook { - NativeImageLoaderSpecJSI::NativeImageLoaderSpecJSI(id instance, std::shared_ptr jsInvoker) + NativeImageLoaderSpecJSI::NativeImageLoaderSpecJSI(id instance, std::shared_ptr jsInvoker) : ObjCTurboModule("ImageLoader", instance, jsInvoker) { @@ -1190,7 +1190,7 @@ namespace facebook { } - NativeImagePickerIOSSpecJSI::NativeImagePickerIOSSpecJSI(id instance, std::shared_ptr jsInvoker) + NativeImagePickerIOSSpecJSI::NativeImagePickerIOSSpecJSI(id instance, std::shared_ptr jsInvoker) : ObjCTurboModule("ImagePickerIOS", instance, jsInvoker) { methodMap_["canRecordVideos"] = MethodMetadata {1, __hostFunction_NativeImagePickerIOSSpecJSI_canRecordVideos}; @@ -1221,7 +1221,7 @@ namespace facebook { } - NativeJSCSamplingProfilerSpecJSI::NativeJSCSamplingProfilerSpecJSI(id instance, std::shared_ptr jsInvoker) + NativeJSCSamplingProfilerSpecJSI::NativeJSCSamplingProfilerSpecJSI(id instance, std::shared_ptr jsInvoker) : ObjCTurboModule("JSCSamplingProfiler", instance, jsInvoker) { methodMap_["operationComplete"] = MethodMetadata {3, __hostFunction_NativeJSCSamplingProfilerSpecJSI_operationComplete}; @@ -1249,7 +1249,7 @@ namespace facebook { } - NativeJSDevSupportSpecJSI::NativeJSDevSupportSpecJSI(id instance, std::shared_ptr jsInvoker) + NativeJSDevSupportSpecJSI::NativeJSDevSupportSpecJSI(id instance, std::shared_ptr jsInvoker) : ObjCTurboModule("JSDevSupport", instance, jsInvoker) { methodMap_["onSuccess"] = MethodMetadata {1, __hostFunction_NativeJSDevSupportSpecJSI_onSuccess}; @@ -1279,7 +1279,7 @@ namespace facebook { } - NativeKeyboardObserverSpecJSI::NativeKeyboardObserverSpecJSI(id instance, std::shared_ptr jsInvoker) + NativeKeyboardObserverSpecJSI::NativeKeyboardObserverSpecJSI(id instance, std::shared_ptr jsInvoker) : ObjCTurboModule("KeyboardObserver", instance, jsInvoker) { methodMap_["addListener"] = MethodMetadata {1, __hostFunction_NativeKeyboardObserverSpecJSI_addListener}; @@ -1332,7 +1332,7 @@ namespace facebook { } - NativeLinkingSpecJSI::NativeLinkingSpecJSI(id instance, std::shared_ptr jsInvoker) + NativeLinkingSpecJSI::NativeLinkingSpecJSI(id instance, std::shared_ptr jsInvoker) : ObjCTurboModule("Linking", instance, jsInvoker) { methodMap_["getInitialURL"] = MethodMetadata {0, __hostFunction_NativeLinkingSpecJSI_getInitialURL}; @@ -1374,7 +1374,7 @@ namespace facebook { } - NativeModalManagerSpecJSI::NativeModalManagerSpecJSI(id instance, std::shared_ptr jsInvoker) + NativeModalManagerSpecJSI::NativeModalManagerSpecJSI(id instance, std::shared_ptr jsInvoker) : ObjCTurboModule("ModalManager", instance, jsInvoker) { methodMap_["addListener"] = MethodMetadata {1, __hostFunction_NativeModalManagerSpecJSI_addListener}; @@ -1419,7 +1419,7 @@ namespace facebook { } - NativeNetworkingAndroidSpecJSI::NativeNetworkingAndroidSpecJSI(id instance, std::shared_ptr jsInvoker) + NativeNetworkingAndroidSpecJSI::NativeNetworkingAndroidSpecJSI(id instance, std::shared_ptr jsInvoker) : ObjCTurboModule("NetworkingAndroid", instance, jsInvoker) { methodMap_["sendRequest"] = MethodMetadata {9, __hostFunction_NativeNetworkingAndroidSpecJSI_sendRequest}; @@ -1473,7 +1473,7 @@ namespace facebook { } - NativeNetworkingIOSSpecJSI::NativeNetworkingIOSSpecJSI(id instance, std::shared_ptr jsInvoker) + NativeNetworkingIOSSpecJSI::NativeNetworkingIOSSpecJSI(id instance, std::shared_ptr jsInvoker) : ObjCTurboModule("NetworkingIOS", instance, jsInvoker) { methodMap_["sendRequest"] = MethodMetadata {2, __hostFunction_NativeNetworkingIOSSpecJSI_sendRequest}; @@ -1518,7 +1518,7 @@ namespace facebook { } - NativePermissionsAndroidSpecJSI::NativePermissionsAndroidSpecJSI(id instance, std::shared_ptr jsInvoker) + NativePermissionsAndroidSpecJSI::NativePermissionsAndroidSpecJSI(id instance, std::shared_ptr jsInvoker) : ObjCTurboModule("PermissionsAndroid", instance, jsInvoker) { methodMap_["checkPermission"] = MethodMetadata {1, __hostFunction_NativePermissionsAndroidSpecJSI_checkPermission}; @@ -1551,7 +1551,7 @@ namespace facebook { } - NativePlatformConstantsAndroidSpecJSI::NativePlatformConstantsAndroidSpecJSI(id instance, std::shared_ptr jsInvoker) + NativePlatformConstantsAndroidSpecJSI::NativePlatformConstantsAndroidSpecJSI(id instance, std::shared_ptr jsInvoker) : ObjCTurboModule("PlatformConstantsAndroid", instance, jsInvoker) { methodMap_["getAndroidID"] = MethodMetadata {0, __hostFunction_NativePlatformConstantsAndroidSpecJSI_getAndroidID}; @@ -1574,7 +1574,7 @@ namespace facebook { } - NativePlatformConstantsIOSSpecJSI::NativePlatformConstantsIOSSpecJSI(id instance, std::shared_ptr jsInvoker) + NativePlatformConstantsIOSSpecJSI::NativePlatformConstantsIOSSpecJSI(id instance, std::shared_ptr jsInvoker) : ObjCTurboModule("PlatformConstantsIOS", instance, jsInvoker) { methodMap_["getConstants"] = MethodMetadata {0, __hostFunction_NativePlatformConstantsIOSSpecJSI_getConstants}; @@ -1676,7 +1676,7 @@ namespace facebook { } - NativePushNotificationManagerIOSSpecJSI::NativePushNotificationManagerIOSSpecJSI(id instance, std::shared_ptr jsInvoker) + NativePushNotificationManagerIOSSpecJSI::NativePushNotificationManagerIOSSpecJSI(id instance, std::shared_ptr jsInvoker) : ObjCTurboModule("PushNotificationManagerIOS", instance, jsInvoker) { methodMap_["onFinishRemoteNotification"] = MethodMetadata {2, __hostFunction_NativePushNotificationManagerIOSSpecJSI_onFinishRemoteNotification}; @@ -1751,7 +1751,7 @@ namespace facebook { } - NativeRedBoxSpecJSI::NativeRedBoxSpecJSI(id instance, std::shared_ptr jsInvoker) + NativeRedBoxSpecJSI::NativeRedBoxSpecJSI(id instance, std::shared_ptr jsInvoker) : ObjCTurboModule("RedBox", instance, jsInvoker) { methodMap_["setExtraData"] = MethodMetadata {2, __hostFunction_NativeRedBoxSpecJSI_setExtraData}; @@ -1778,7 +1778,7 @@ namespace facebook { } - NativeSegmentFetcherSpecJSI::NativeSegmentFetcherSpecJSI(id instance, std::shared_ptr jsInvoker) + NativeSegmentFetcherSpecJSI::NativeSegmentFetcherSpecJSI(id instance, std::shared_ptr jsInvoker) : ObjCTurboModule("SegmentFetcher", instance, jsInvoker) { methodMap_["fetchSegment"] = MethodMetadata {3, __hostFunction_NativeSegmentFetcherSpecJSI_fetchSegment}; @@ -1809,7 +1809,7 @@ namespace facebook { } - NativeSettingsManagerSpecJSI::NativeSettingsManagerSpecJSI(id instance, std::shared_ptr jsInvoker) + NativeSettingsManagerSpecJSI::NativeSettingsManagerSpecJSI(id instance, std::shared_ptr jsInvoker) : ObjCTurboModule("SettingsManager", instance, jsInvoker) { methodMap_["setValues"] = MethodMetadata {1, __hostFunction_NativeSettingsManagerSpecJSI_setValues}; @@ -1841,7 +1841,7 @@ namespace facebook { } - NativeShareModuleSpecJSI::NativeShareModuleSpecJSI(id instance, std::shared_ptr jsInvoker) + NativeShareModuleSpecJSI::NativeShareModuleSpecJSI(id instance, std::shared_ptr jsInvoker) : ObjCTurboModule("ShareModule", instance, jsInvoker) { methodMap_["share"] = MethodMetadata {2, __hostFunction_NativeShareModuleSpecJSI_share}; @@ -1862,7 +1862,7 @@ namespace facebook { } - NativeSoundManagerSpecJSI::NativeSoundManagerSpecJSI(id instance, std::shared_ptr jsInvoker) + NativeSoundManagerSpecJSI::NativeSoundManagerSpecJSI(id instance, std::shared_ptr jsInvoker) : ObjCTurboModule("SoundManager", instance, jsInvoker) { methodMap_["playTouchSound"] = MethodMetadata {0, __hostFunction_NativeSoundManagerSpecJSI_playTouchSound}; @@ -1882,7 +1882,7 @@ namespace facebook { } - NativeSourceCodeSpecJSI::NativeSourceCodeSpecJSI(id instance, std::shared_ptr jsInvoker) + NativeSourceCodeSpecJSI::NativeSourceCodeSpecJSI(id instance, std::shared_ptr jsInvoker) : ObjCTurboModule("SourceCode", instance, jsInvoker) { methodMap_["getConstants"] = MethodMetadata {0, __hostFunction_NativeSourceCodeSpecJSI_getConstants}; @@ -1940,7 +1940,7 @@ namespace facebook { } - NativeStatusBarManagerSpecJSI::NativeStatusBarManagerSpecJSI(id instance, std::shared_ptr jsInvoker) + NativeStatusBarManagerSpecJSI::NativeStatusBarManagerSpecJSI(id instance, std::shared_ptr jsInvoker) : ObjCTurboModule("StatusBarManager", instance, jsInvoker) { methodMap_["setColor"] = MethodMetadata {2, __hostFunction_NativeStatusBarManagerSpecJSI_setColor}; @@ -1988,7 +1988,7 @@ namespace facebook { } - NativeTVNavigationEventEmitterSpecJSI::NativeTVNavigationEventEmitterSpecJSI(id instance, std::shared_ptr jsInvoker) + NativeTVNavigationEventEmitterSpecJSI::NativeTVNavigationEventEmitterSpecJSI(id instance, std::shared_ptr jsInvoker) : ObjCTurboModule("TVNavigationEventEmitter", instance, jsInvoker) { methodMap_["addListener"] = MethodMetadata {1, __hostFunction_NativeTVNavigationEventEmitterSpecJSI_addListener}; @@ -2019,7 +2019,7 @@ namespace facebook { } - NativeTimingSpecJSI::NativeTimingSpecJSI(id instance, std::shared_ptr jsInvoker) + NativeTimingSpecJSI::NativeTimingSpecJSI(id instance, std::shared_ptr jsInvoker) : ObjCTurboModule("Timing", instance, jsInvoker) { methodMap_["createTimer"] = MethodMetadata {4, __hostFunction_NativeTimingSpecJSI_createTimer}; @@ -2057,7 +2057,7 @@ namespace facebook { } - NativeToastAndroidSpecJSI::NativeToastAndroidSpecJSI(id instance, std::shared_ptr jsInvoker) + NativeToastAndroidSpecJSI::NativeToastAndroidSpecJSI(id instance, std::shared_ptr jsInvoker) : ObjCTurboModule("ToastAndroid", instance, jsInvoker) { methodMap_["show"] = MethodMetadata {2, __hostFunction_NativeToastAndroidSpecJSI_show}; @@ -2190,7 +2190,7 @@ namespace facebook { } - NativeUIManagerSpecJSI::NativeUIManagerSpecJSI(id instance, std::shared_ptr jsInvoker) + NativeUIManagerSpecJSI::NativeUIManagerSpecJSI(id instance, std::shared_ptr jsInvoker) : ObjCTurboModule("UIManager", instance, jsInvoker) { methodMap_["getConstantsForViewManager"] = MethodMetadata {1, __hostFunction_NativeUIManagerSpecJSI_getConstantsForViewManager}; @@ -2296,7 +2296,7 @@ namespace facebook { } - NativeVibrationSpecJSI::NativeVibrationSpecJSI(id instance, std::shared_ptr jsInvoker) + NativeVibrationSpecJSI::NativeVibrationSpecJSI(id instance, std::shared_ptr jsInvoker) : ObjCTurboModule("Vibration", instance, jsInvoker) { methodMap_["vibrate"] = MethodMetadata {1, __hostFunction_NativeVibrationSpecJSI_vibrate}; @@ -2358,7 +2358,7 @@ namespace facebook { } - NativeWebSocketModuleSpecJSI::NativeWebSocketModuleSpecJSI(id instance, std::shared_ptr jsInvoker) + NativeWebSocketModuleSpecJSI::NativeWebSocketModuleSpecJSI(id instance, std::shared_ptr jsInvoker) : ObjCTurboModule("WebSocketModule", instance, jsInvoker) { methodMap_["connect"] = MethodMetadata {4, __hostFunction_NativeWebSocketModuleSpecJSI_connect}; diff --git a/Libraries/FBReactNativeSpec/FBReactNativeSpec/FBReactNativeSpec.h b/Libraries/FBReactNativeSpec/FBReactNativeSpec/FBReactNativeSpec.h index 860b261a615..208b7daa28a 100644 --- a/Libraries/FBReactNativeSpec/FBReactNativeSpec/FBReactNativeSpec.h +++ b/Libraries/FBReactNativeSpec/FBReactNativeSpec/FBReactNativeSpec.h @@ -42,7 +42,7 @@ namespace facebook { class JSI_EXPORT NativeAccessibilityInfoSpecJSI : public ObjCTurboModule { public: - NativeAccessibilityInfoSpecJSI(id instance, std::shared_ptr jsInvoker); + NativeAccessibilityInfoSpecJSI(id instance, std::shared_ptr jsInvoker); }; } // namespace react @@ -101,7 +101,7 @@ namespace facebook { class JSI_EXPORT NativeAccessibilityManagerSpecJSI : public ObjCTurboModule { public: - NativeAccessibilityManagerSpecJSI(id instance, std::shared_ptr jsInvoker); + NativeAccessibilityManagerSpecJSI(id instance, std::shared_ptr jsInvoker); }; } // namespace react @@ -185,7 +185,7 @@ namespace facebook { class JSI_EXPORT NativeActionSheetManagerSpecJSI : public ObjCTurboModule { public: - NativeActionSheetManagerSpecJSI(id instance, std::shared_ptr jsInvoker); + NativeActionSheetManagerSpecJSI(id instance, std::shared_ptr jsInvoker); }; } // namespace react @@ -227,7 +227,7 @@ namespace facebook { class JSI_EXPORT NativeAlertManagerSpecJSI : public ObjCTurboModule { public: - NativeAlertManagerSpecJSI(id instance, std::shared_ptr jsInvoker); + NativeAlertManagerSpecJSI(id instance, std::shared_ptr jsInvoker); }; } // namespace react @@ -341,7 +341,7 @@ namespace facebook { class JSI_EXPORT NativeAnimatedModuleSpecJSI : public ObjCTurboModule { public: - NativeAnimatedModuleSpecJSI(id instance, std::shared_ptr jsInvoker); + NativeAnimatedModuleSpecJSI(id instance, std::shared_ptr jsInvoker); }; } // namespace react @@ -360,7 +360,7 @@ namespace facebook { class JSI_EXPORT NativeAnimationsDebugModuleSpecJSI : public ObjCTurboModule { public: - NativeAnimationsDebugModuleSpecJSI(id instance, std::shared_ptr jsInvoker); + NativeAnimationsDebugModuleSpecJSI(id instance, std::shared_ptr jsInvoker); }; } // namespace react @@ -427,7 +427,7 @@ namespace facebook { class JSI_EXPORT NativeAppStateSpecJSI : public ObjCTurboModule { public: - NativeAppStateSpecJSI(id instance, std::shared_ptr jsInvoker); + NativeAppStateSpecJSI(id instance, std::shared_ptr jsInvoker); }; } // namespace react @@ -447,7 +447,7 @@ namespace facebook { class JSI_EXPORT NativeAppearanceSpecJSI : public ObjCTurboModule { public: - NativeAppearanceSpecJSI(id instance, std::shared_ptr jsInvoker); + NativeAppearanceSpecJSI(id instance, std::shared_ptr jsInvoker); }; } // namespace react @@ -593,7 +593,7 @@ namespace facebook { class JSI_EXPORT NativeAsyncStorageSpecJSI : public ObjCTurboModule { public: - NativeAsyncStorageSpecJSI(id instance, std::shared_ptr jsInvoker); + NativeAsyncStorageSpecJSI(id instance, std::shared_ptr jsInvoker); }; } // namespace react @@ -649,7 +649,7 @@ namespace facebook { class JSI_EXPORT NativeBlobModuleSpecJSI : public ObjCTurboModule { public: - NativeBlobModuleSpecJSI(id instance, std::shared_ptr jsInvoker); + NativeBlobModuleSpecJSI(id instance, std::shared_ptr jsInvoker); }; } // namespace react @@ -670,7 +670,7 @@ namespace facebook { class JSI_EXPORT NativeBugReportingSpecJSI : public ObjCTurboModule { public: - NativeBugReportingSpecJSI(id instance, std::shared_ptr jsInvoker); + NativeBugReportingSpecJSI(id instance, std::shared_ptr jsInvoker); }; } // namespace react @@ -690,7 +690,7 @@ namespace facebook { class JSI_EXPORT NativeClipboardSpecJSI : public ObjCTurboModule { public: - NativeClipboardSpecJSI(id instance, std::shared_ptr jsInvoker); + NativeClipboardSpecJSI(id instance, std::shared_ptr jsInvoker); }; } // namespace react @@ -710,7 +710,7 @@ namespace facebook { class JSI_EXPORT NativeDatePickerAndroidSpecJSI : public ObjCTurboModule { public: - NativeDatePickerAndroidSpecJSI(id instance, std::shared_ptr jsInvoker); + NativeDatePickerAndroidSpecJSI(id instance, std::shared_ptr jsInvoker); }; } // namespace react @@ -731,7 +731,7 @@ namespace facebook { class JSI_EXPORT NativeDevLoadingViewSpecJSI : public ObjCTurboModule { public: - NativeDevLoadingViewSpecJSI(id instance, std::shared_ptr jsInvoker); + NativeDevLoadingViewSpecJSI(id instance, std::shared_ptr jsInvoker); }; } // namespace react @@ -755,7 +755,7 @@ namespace facebook { class JSI_EXPORT NativeDevSettingsSpecJSI : public ObjCTurboModule { public: - NativeDevSettingsSpecJSI(id instance, std::shared_ptr jsInvoker); + NativeDevSettingsSpecJSI(id instance, std::shared_ptr jsInvoker); }; } // namespace react @@ -773,7 +773,7 @@ namespace facebook { class JSI_EXPORT NativeDeviceEventManagerSpecJSI : public ObjCTurboModule { public: - NativeDeviceEventManagerSpecJSI(id instance, std::shared_ptr jsInvoker); + NativeDeviceEventManagerSpecJSI(id instance, std::shared_ptr jsInvoker); }; } // namespace react @@ -821,7 +821,7 @@ namespace facebook { class JSI_EXPORT NativeDeviceInfoSpecJSI : public ObjCTurboModule { public: - NativeDeviceInfoSpecJSI(id instance, std::shared_ptr jsInvoker); + NativeDeviceInfoSpecJSI(id instance, std::shared_ptr jsInvoker); }; } // namespace react @@ -897,7 +897,7 @@ namespace facebook { class JSI_EXPORT NativeDialogManagerAndroidSpecJSI : public ObjCTurboModule { public: - NativeDialogManagerAndroidSpecJSI(id instance, std::shared_ptr jsInvoker); + NativeDialogManagerAndroidSpecJSI(id instance, std::shared_ptr jsInvoker); }; } // namespace react @@ -968,7 +968,7 @@ namespace facebook { class JSI_EXPORT NativeExceptionsManagerSpecJSI : public ObjCTurboModule { public: - NativeExceptionsManagerSpecJSI(id instance, std::shared_ptr jsInvoker); + NativeExceptionsManagerSpecJSI(id instance, std::shared_ptr jsInvoker); }; } // namespace react @@ -992,7 +992,7 @@ namespace facebook { class JSI_EXPORT NativeFileReaderModuleSpecJSI : public ObjCTurboModule { public: - NativeFileReaderModuleSpecJSI(id instance, std::shared_ptr jsInvoker); + NativeFileReaderModuleSpecJSI(id instance, std::shared_ptr jsInvoker); }; } // namespace react @@ -1030,7 +1030,7 @@ namespace facebook { class JSI_EXPORT NativeFrameRateLoggerSpecJSI : public ObjCTurboModule { public: - NativeFrameRateLoggerSpecJSI(id instance, std::shared_ptr jsInvoker); + NativeFrameRateLoggerSpecJSI(id instance, std::shared_ptr jsInvoker); }; } // namespace react @@ -1051,7 +1051,7 @@ namespace facebook { class JSI_EXPORT NativeHeadlessJsTaskSupportSpecJSI : public ObjCTurboModule { public: - NativeHeadlessJsTaskSupportSpecJSI(id instance, std::shared_ptr jsInvoker); + NativeHeadlessJsTaskSupportSpecJSI(id instance, std::shared_ptr jsInvoker); }; } // namespace react @@ -1071,7 +1071,7 @@ namespace facebook { class JSI_EXPORT NativeHeapCaptureSpecJSI : public ObjCTurboModule { public: - NativeHeapCaptureSpecJSI(id instance, std::shared_ptr jsInvoker); + NativeHeapCaptureSpecJSI(id instance, std::shared_ptr jsInvoker); }; } // namespace react @@ -1122,7 +1122,7 @@ namespace facebook { class JSI_EXPORT NativeI18nManagerSpecJSI : public ObjCTurboModule { public: - NativeI18nManagerSpecJSI(id instance, std::shared_ptr jsInvoker); + NativeI18nManagerSpecJSI(id instance, std::shared_ptr jsInvoker); }; } // namespace react @@ -1137,7 +1137,7 @@ namespace facebook { class JSI_EXPORT NativeImageLoaderSpecJSI : public ObjCTurboModule { public: - NativeImageLoaderSpecJSI(id instance, std::shared_ptr jsInvoker); + NativeImageLoaderSpecJSI(id instance, std::shared_ptr jsInvoker); }; } // namespace react @@ -1196,7 +1196,7 @@ namespace facebook { class JSI_EXPORT NativeImagePickerIOSSpecJSI : public ObjCTurboModule { public: - NativeImagePickerIOSSpecJSI(id instance, std::shared_ptr jsInvoker); + NativeImagePickerIOSSpecJSI(id instance, std::shared_ptr jsInvoker); }; } // namespace react @@ -1216,7 +1216,7 @@ namespace facebook { class JSI_EXPORT NativeJSCSamplingProfilerSpecJSI : public ObjCTurboModule { public: - NativeJSCSamplingProfilerSpecJSI(id instance, std::shared_ptr jsInvoker); + NativeJSCSamplingProfilerSpecJSI(id instance, std::shared_ptr jsInvoker); }; } // namespace react @@ -1267,7 +1267,7 @@ namespace facebook { class JSI_EXPORT NativeJSDevSupportSpecJSI : public ObjCTurboModule { public: - NativeJSDevSupportSpecJSI(id instance, std::shared_ptr jsInvoker); + NativeJSDevSupportSpecJSI(id instance, std::shared_ptr jsInvoker); }; } // namespace react @@ -1286,7 +1286,7 @@ namespace facebook { class JSI_EXPORT NativeKeyboardObserverSpecJSI : public ObjCTurboModule { public: - NativeKeyboardObserverSpecJSI(id instance, std::shared_ptr jsInvoker); + NativeKeyboardObserverSpecJSI(id instance, std::shared_ptr jsInvoker); }; } // namespace react @@ -1336,7 +1336,7 @@ namespace facebook { class JSI_EXPORT NativeLinkingSpecJSI : public ObjCTurboModule { public: - NativeLinkingSpecJSI(id instance, std::shared_ptr jsInvoker); + NativeLinkingSpecJSI(id instance, std::shared_ptr jsInvoker); }; } // namespace react @@ -1355,7 +1355,7 @@ namespace facebook { class JSI_EXPORT NativeModalManagerSpecJSI : public ObjCTurboModule { public: - NativeModalManagerSpecJSI(id instance, std::shared_ptr jsInvoker); + NativeModalManagerSpecJSI(id instance, std::shared_ptr jsInvoker); }; } // namespace react @@ -1402,7 +1402,7 @@ namespace facebook { class JSI_EXPORT NativeNetworkingAndroidSpecJSI : public ObjCTurboModule { public: - NativeNetworkingAndroidSpecJSI(id instance, std::shared_ptr jsInvoker); + NativeNetworkingAndroidSpecJSI(id instance, std::shared_ptr jsInvoker); }; } // namespace react @@ -1448,7 +1448,7 @@ namespace facebook { class JSI_EXPORT NativeNetworkingIOSSpecJSI : public ObjCTurboModule { public: - NativeNetworkingIOSSpecJSI(id instance, std::shared_ptr jsInvoker); + NativeNetworkingIOSSpecJSI(id instance, std::shared_ptr jsInvoker); }; } // namespace react @@ -1477,7 +1477,7 @@ namespace facebook { class JSI_EXPORT NativePermissionsAndroidSpecJSI : public ObjCTurboModule { public: - NativePermissionsAndroidSpecJSI(id instance, std::shared_ptr jsInvoker); + NativePermissionsAndroidSpecJSI(id instance, std::shared_ptr jsInvoker); }; } // namespace react @@ -1564,7 +1564,7 @@ namespace facebook { class JSI_EXPORT NativePlatformConstantsAndroidSpecJSI : public ObjCTurboModule { public: - NativePlatformConstantsAndroidSpecJSI(id instance, std::shared_ptr jsInvoker); + NativePlatformConstantsAndroidSpecJSI(id instance, std::shared_ptr jsInvoker); }; } // namespace react @@ -1647,7 +1647,7 @@ namespace facebook { class JSI_EXPORT NativePlatformConstantsIOSSpecJSI : public ObjCTurboModule { public: - NativePlatformConstantsIOSSpecJSI(id instance, std::shared_ptr jsInvoker); + NativePlatformConstantsIOSSpecJSI(id instance, std::shared_ptr jsInvoker); }; } // namespace react @@ -1745,7 +1745,7 @@ namespace facebook { class JSI_EXPORT NativePushNotificationManagerIOSSpecJSI : public ObjCTurboModule { public: - NativePushNotificationManagerIOSSpecJSI(id instance, std::shared_ptr jsInvoker); + NativePushNotificationManagerIOSSpecJSI(id instance, std::shared_ptr jsInvoker); }; } // namespace react @@ -1765,7 +1765,7 @@ namespace facebook { class JSI_EXPORT NativeRedBoxSpecJSI : public ObjCTurboModule { public: - NativeRedBoxSpecJSI(id instance, std::shared_ptr jsInvoker); + NativeRedBoxSpecJSI(id instance, std::shared_ptr jsInvoker); }; } // namespace react @@ -1788,7 +1788,7 @@ namespace facebook { class JSI_EXPORT NativeSegmentFetcherSpecJSI : public ObjCTurboModule { public: - NativeSegmentFetcherSpecJSI(id instance, std::shared_ptr jsInvoker); + NativeSegmentFetcherSpecJSI(id instance, std::shared_ptr jsInvoker); }; } // namespace react @@ -1837,7 +1837,7 @@ namespace facebook { class JSI_EXPORT NativeSettingsManagerSpecJSI : public ObjCTurboModule { public: - NativeSettingsManagerSpecJSI(id instance, std::shared_ptr jsInvoker); + NativeSettingsManagerSpecJSI(id instance, std::shared_ptr jsInvoker); }; } // namespace react @@ -1875,7 +1875,7 @@ namespace facebook { class JSI_EXPORT NativeShareModuleSpecJSI : public ObjCTurboModule { public: - NativeShareModuleSpecJSI(id instance, std::shared_ptr jsInvoker); + NativeShareModuleSpecJSI(id instance, std::shared_ptr jsInvoker); }; } // namespace react @@ -1893,7 +1893,7 @@ namespace facebook { class JSI_EXPORT NativeSoundManagerSpecJSI : public ObjCTurboModule { public: - NativeSoundManagerSpecJSI(id instance, std::shared_ptr jsInvoker); + NativeSoundManagerSpecJSI(id instance, std::shared_ptr jsInvoker); }; } // namespace react @@ -1940,7 +1940,7 @@ namespace facebook { class JSI_EXPORT NativeSourceCodeSpecJSI : public ObjCTurboModule { public: - NativeSourceCodeSpecJSI(id instance, std::shared_ptr jsInvoker); + NativeSourceCodeSpecJSI(id instance, std::shared_ptr jsInvoker); }; } // namespace react @@ -2015,7 +2015,7 @@ namespace facebook { class JSI_EXPORT NativeStatusBarManagerSpecJSI : public ObjCTurboModule { public: - NativeStatusBarManagerSpecJSI(id instance, std::shared_ptr jsInvoker); + NativeStatusBarManagerSpecJSI(id instance, std::shared_ptr jsInvoker); }; } // namespace react @@ -2034,7 +2034,7 @@ namespace facebook { class JSI_EXPORT NativeTVNavigationEventEmitterSpecJSI : public ObjCTurboModule { public: - NativeTVNavigationEventEmitterSpecJSI(id instance, std::shared_ptr jsInvoker); + NativeTVNavigationEventEmitterSpecJSI(id instance, std::shared_ptr jsInvoker); }; } // namespace react @@ -2057,7 +2057,7 @@ namespace facebook { class JSI_EXPORT NativeTimingSpecJSI : public ObjCTurboModule { public: - NativeTimingSpecJSI(id instance, std::shared_ptr jsInvoker); + NativeTimingSpecJSI(id instance, std::shared_ptr jsInvoker); }; } // namespace react @@ -2118,7 +2118,7 @@ namespace facebook { class JSI_EXPORT NativeToastAndroidSpecJSI : public ObjCTurboModule { public: - NativeToastAndroidSpecJSI(id instance, std::shared_ptr jsInvoker); + NativeToastAndroidSpecJSI(id instance, std::shared_ptr jsInvoker); }; } // namespace react @@ -2222,7 +2222,7 @@ namespace facebook { class JSI_EXPORT NativeUIManagerSpecJSI : public ObjCTurboModule { public: - NativeUIManagerSpecJSI(id instance, std::shared_ptr jsInvoker); + NativeUIManagerSpecJSI(id instance, std::shared_ptr jsInvoker); }; } // namespace react @@ -2243,7 +2243,7 @@ namespace facebook { class JSI_EXPORT NativeVibrationSpecJSI : public ObjCTurboModule { public: - NativeVibrationSpecJSI(id instance, std::shared_ptr jsInvoker); + NativeVibrationSpecJSI(id instance, std::shared_ptr jsInvoker); }; } // namespace react @@ -2306,7 +2306,7 @@ namespace facebook { class JSI_EXPORT NativeWebSocketModuleSpecJSI : public ObjCTurboModule { public: - NativeWebSocketModuleSpecJSI(id instance, std::shared_ptr jsInvoker); + NativeWebSocketModuleSpecJSI(id instance, std::shared_ptr jsInvoker); }; } // namespace react diff --git a/RNTester/Podfile.lock b/RNTester/Podfile.lock index c29359f607f..04eae6654a4 100644 --- a/RNTester/Podfile.lock +++ b/RNTester/Podfile.lock @@ -226,7 +226,7 @@ PODS: - React-Core/RCTTextHeaders (= 1000.0.0) - React-RCTVibration (1000.0.0): - React-Core/RCTVibrationHeaders (= 1000.0.0) - - ReactCommon/jscallinvoker (1000.0.0): + - ReactCommon/callinvoker (1000.0.0): - DoubleConversion - Folly (= 2018.10.22.00) - glog @@ -238,7 +238,7 @@ PODS: - React-Core (= 1000.0.0) - React-cxxreact (= 1000.0.0) - React-jsi (= 1000.0.0) - - ReactCommon/jscallinvoker (= 1000.0.0) + - ReactCommon/callinvoker (= 1000.0.0) - ReactCommon/turbomodule/samples (1000.0.0): - DoubleConversion - Folly (= 2018.10.22.00) @@ -246,7 +246,7 @@ PODS: - React-Core (= 1000.0.0) - React-cxxreact (= 1000.0.0) - React-jsi (= 1000.0.0) - - ReactCommon/jscallinvoker (= 1000.0.0) + - ReactCommon/callinvoker (= 1000.0.0) - ReactCommon/turbomodule/core (= 1000.0.0) - Yoga (1.14.0) @@ -279,7 +279,7 @@ DEPENDENCIES: - React-RCTTest (from `RCTTest`) - React-RCTText (from `../Libraries/Text`) - React-RCTVibration (from `../Libraries/Vibration`) - - ReactCommon/jscallinvoker (from `../ReactCommon`) + - ReactCommon/callinvoker (from `../ReactCommon`) - ReactCommon/turbomodule/core (from `../ReactCommon`) - ReactCommon/turbomodule/samples (from `../ReactCommon`) - Yoga (from `../ReactCommon/yoga`) @@ -374,7 +374,7 @@ SPEC CHECKSUMS: React-RCTTest: 73df09ec226fcad6e7e058a313e5dd16cccf86a8 React-RCTText: 9078167d3bc011162326f2d8ef4dd580ec1eca17 React-RCTVibration: 63c20d89204937ff8c7bbc1e712383347e6fbd90 - ReactCommon: 63d1a6355d5810a21a61efda9ac93804571a1b8b + ReactCommon: 9d212865526209dc2d01be40340c8d27b53e6bea Yoga: d88d8b51ee5b247f43211e2edf272438df1b484f PODFILE CHECKSUM: 060903e270072f1e192b064848e6c34528af1c87 diff --git a/RNTester/RNTester/AppDelegate.mm b/RNTester/RNTester/AppDelegate.mm index e7c89098edc..ac3a046a7ff 100644 --- a/RNTester/RNTester/AppDelegate.mm +++ b/RNTester/RNTester/AppDelegate.mm @@ -129,14 +129,14 @@ } - (std::shared_ptr)getTurboModule:(const std::string &)name - jsInvoker:(std::shared_ptr)jsInvoker + jsInvoker:(std::shared_ptr)jsInvoker { return facebook::react::RNTesterTurboModuleProvider(name, jsInvoker); } - (std::shared_ptr)getTurboModule:(const std::string &)name instance:(id)instance - jsInvoker:(std::shared_ptr)jsInvoker + jsInvoker:(std::shared_ptr)jsInvoker { return facebook::react::RNTesterTurboModuleProvider(name, instance, jsInvoker); } diff --git a/RNTester/RNTester/RNTesterTurboModuleProvider.h b/RNTester/RNTester/RNTesterTurboModuleProvider.h index 2d4e99f8e32..ea4e4ffd3dc 100644 --- a/RNTester/RNTester/RNTesterTurboModuleProvider.h +++ b/RNTester/RNTester/RNTesterTurboModuleProvider.h @@ -19,14 +19,14 @@ Class RNTesterTurboModuleClassProvider(const char *name); /** * Provide a pure C++ instance of a TurboModule, specific to this app. */ -std::shared_ptr RNTesterTurboModuleProvider(const std::string &name, std::shared_ptr jsInvoker); +std::shared_ptr RNTesterTurboModuleProvider(const std::string &name, std::shared_ptr jsInvoker); /** * Provide an instance of a ObjCTurboModule, given the ObjC instance, specific to this app. */ std::shared_ptr RNTesterTurboModuleProvider(const std::string &name, id instance, - std::shared_ptr jsInvoker); + std::shared_ptr jsInvoker); } // namespace react } // namespace facebook diff --git a/RNTester/RNTester/RNTesterTurboModuleProvider.mm b/RNTester/RNTester/RNTesterTurboModuleProvider.mm index d8283bd12ef..58b2cf35e28 100644 --- a/RNTester/RNTester/RNTesterTurboModuleProvider.mm +++ b/RNTester/RNTester/RNTesterTurboModuleProvider.mm @@ -21,7 +21,7 @@ Class RNTesterTurboModuleClassProvider(const char *name) { return RCTCoreModulesClassProvider(name); } -std::shared_ptr RNTesterTurboModuleProvider(const std::string &name, std::shared_ptr jsInvoker) { +std::shared_ptr RNTesterTurboModuleProvider(const std::string &name, std::shared_ptr jsInvoker) { if (name == "SampleTurboCxxModule") { return std::make_shared(jsInvoker); } @@ -31,7 +31,7 @@ std::shared_ptr RNTesterTurboModuleProvider(const std::string &name std::shared_ptr RNTesterTurboModuleProvider(const std::string &name, id instance, - std::shared_ptr jsInvoker) { + std::shared_ptr jsInvoker) { if (name == "SampleTurboModule") { return std::make_shared(instance, jsInvoker); } diff --git a/React/CoreModules/RCTAccessibilityManager.mm b/React/CoreModules/RCTAccessibilityManager.mm index 4e8b935617e..f27d8e107e8 100644 --- a/React/CoreModules/RCTAccessibilityManager.mm +++ b/React/CoreModules/RCTAccessibilityManager.mm @@ -334,7 +334,7 @@ RCT_EXPORT_METHOD(getCurrentVoiceOverState:(RCTResponseSenderBlock)onSuccess - (std::shared_ptr)getTurboModuleWithJsInvoker: -(std::shared_ptr)jsInvoker +(std::shared_ptr)jsInvoker { return std::make_shared(self, jsInvoker); } diff --git a/React/CoreModules/RCTAppearance.mm b/React/CoreModules/RCTAppearance.mm index 9af83051184..f44c52ce3cf 100644 --- a/React/CoreModules/RCTAppearance.mm +++ b/React/CoreModules/RCTAppearance.mm @@ -57,7 +57,7 @@ RCT_EXPORT_MODULE(Appearance) return dispatch_get_main_queue(); } -- (std::shared_ptr)getTurboModuleWithJsInvoker:(std::shared_ptr)jsInvoker +- (std::shared_ptr)getTurboModuleWithJsInvoker:(std::shared_ptr)jsInvoker { return std::make_shared(self, jsInvoker); } diff --git a/React/CoreModules/RCTDeviceInfo.mm b/React/CoreModules/RCTDeviceInfo.mm index 06345814395..36c6cfec806 100644 --- a/React/CoreModules/RCTDeviceInfo.mm +++ b/React/CoreModules/RCTDeviceInfo.mm @@ -212,7 +212,7 @@ static NSDictionary *RCTExportedDimensions(RCTBridge *bridge) #endif // TARGET_OS_TV -- (std::shared_ptr)getTurboModuleWithJsInvoker:(std::shared_ptr)jsInvoker +- (std::shared_ptr)getTurboModuleWithJsInvoker:(std::shared_ptr)jsInvoker { return std::make_shared(self, jsInvoker); } diff --git a/React/CoreModules/RCTExceptionsManager.mm b/React/CoreModules/RCTExceptionsManager.mm index fd2554147b8..ee358bd916f 100644 --- a/React/CoreModules/RCTExceptionsManager.mm +++ b/React/CoreModules/RCTExceptionsManager.mm @@ -122,7 +122,7 @@ RCT_EXPORT_METHOD(reportException:(JS::NativeExceptionsManager::ExceptionData &) } - (std::shared_ptr)getTurboModuleWithJsInvoker: -(std::shared_ptr)jsInvoker +(std::shared_ptr)jsInvoker { return std::make_shared(self, jsInvoker); } diff --git a/React/CoreModules/RCTImageLoader.mm b/React/CoreModules/RCTImageLoader.mm index ca4bfac2368..0274221c0b5 100644 --- a/React/CoreModules/RCTImageLoader.mm +++ b/React/CoreModules/RCTImageLoader.mm @@ -944,7 +944,7 @@ static UIImage *RCTResizeImageIfNeeded(UIImage *image, } - (std::shared_ptr)getTurboModuleWithJsInvoker: - (std::shared_ptr)jsInvoker + (std::shared_ptr)jsInvoker { return std::make_shared(self, jsInvoker); } diff --git a/React/CoreModules/RCTPlatform.mm b/React/CoreModules/RCTPlatform.mm index 2eeab3dc6a3..193ee87f79e 100644 --- a/React/CoreModules/RCTPlatform.mm +++ b/React/CoreModules/RCTPlatform.mm @@ -74,7 +74,7 @@ RCT_EXPORT_MODULE(PlatformConstants) }); } -- (std::shared_ptr)getTurboModuleWithJsInvoker:(std::shared_ptr)jsInvoker +- (std::shared_ptr)getTurboModuleWithJsInvoker:(std::shared_ptr)jsInvoker { return std::make_shared(self, jsInvoker); } diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/BUCK b/ReactAndroid/src/main/java/com/facebook/react/bridge/BUCK index 154c36303eb..c147933c5e8 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/bridge/BUCK +++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/BUCK @@ -47,7 +47,7 @@ rn_android_library( react_native_target("java/com/facebook/react/uimanager/common:common"), react_native_target("java/com/facebook/react/module/annotations:annotations"), react_native_target("java/com/facebook/react/turbomodule/core/interfaces:interfaces"), - react_native_target("java/com/facebook/react/turbomodule/core:jscallinvokerholder"), + react_native_target("java/com/facebook/react/turbomodule/core:callinvokerholder"), ] + ([react_native_target("jni/react/jni:jni")] if not IS_OSS_BUILD else []), exported_deps = [ react_native_dep("java/com/facebook/jni:jni"), diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/CatalystInstance.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/CatalystInstance.java index 761eae8ff0c..bcc5376b5d1 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/bridge/CatalystInstance.java +++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/CatalystInstance.java @@ -10,7 +10,7 @@ import androidx.annotation.Nullable; import com.facebook.proguard.annotations.DoNotStrip; import com.facebook.react.bridge.queue.ReactQueueConfiguration; import com.facebook.react.common.annotations.VisibleForTesting; -import com.facebook.react.turbomodule.core.interfaces.JSCallInvokerHolder; +import com.facebook.react.turbomodule.core.interfaces.CallInvokerHolder; import java.util.Collection; import java.util.List; @@ -110,7 +110,7 @@ public interface CatalystInstance * Returns a hybrid object that contains a pointer to JSCallInvoker. Required for * TurboModuleManager initialization. */ - JSCallInvokerHolder getJSCallInvokerHolder(); + CallInvokerHolder getJSCallInvokerHolder(); /** * For the time being, we want code relying on the old infra to also work with TurboModules. diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/CatalystInstanceImpl.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/CatalystInstanceImpl.java index c2da5a77e5f..be5cf5ac86c 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/bridge/CatalystInstanceImpl.java +++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/CatalystInstanceImpl.java @@ -25,7 +25,7 @@ import com.facebook.react.common.ReactConstants; import com.facebook.react.common.annotations.VisibleForTesting; import com.facebook.react.config.ReactFeatureFlags; import com.facebook.react.module.annotations.ReactModule; -import com.facebook.react.turbomodule.core.JSCallInvokerHolderImpl; +import com.facebook.react.turbomodule.core.CallInvokerHolderImpl; import com.facebook.react.turbomodule.core.interfaces.TurboModule; import com.facebook.react.turbomodule.core.interfaces.TurboModuleRegistry; import com.facebook.systrace.Systrace; @@ -107,7 +107,7 @@ public class CatalystInstanceImpl implements CatalystInstance { private static native HybridData initHybrid(); - public native JSCallInvokerHolderImpl getJSCallInvokerHolder(); + public native CallInvokerHolderImpl getJSCallInvokerHolder(); private CatalystInstanceImpl( final ReactQueueConfigurationSpec reactQueueConfigurationSpec, diff --git a/ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/BUCK b/ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/BUCK index 8709f438e48..2e01f230ebe 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/BUCK +++ b/ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/BUCK @@ -6,7 +6,7 @@ rn_android_library( [ "*.java", ], - exclude = ["JSCallInvokerHolderImpl.java"], + exclude = ["CallInvokerHolderImpl.java"], ), required_for_source_only_abi = True, visibility = [ @@ -25,7 +25,7 @@ rn_android_library( react_native_target("java/com/facebook/react/bridge:bridge"), react_native_target("java/com/facebook/react/config:config"), react_native_target("java/com/facebook/react:react"), - ":jscallinvokerholder", + ":callinvokerholder", ], exported_deps = [ react_native_target("java/com/facebook/react/turbomodule/core/interfaces:interfaces"), @@ -33,8 +33,8 @@ rn_android_library( ) rn_android_library( - name = "jscallinvokerholder", - srcs = ["JSCallInvokerHolderImpl.java"], + name = "callinvokerholder", + srcs = ["CallInvokerHolderImpl.java"], required_for_source_only_abi = True, visibility = [ "PUBLIC", diff --git a/ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/JSCallInvokerHolderImpl.java b/ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/CallInvokerHolderImpl.java similarity index 78% rename from ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/JSCallInvokerHolderImpl.java rename to ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/CallInvokerHolderImpl.java index e2ffda1ed23..cb8c7aa5941 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/JSCallInvokerHolderImpl.java +++ b/ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/CallInvokerHolderImpl.java @@ -7,7 +7,7 @@ package com.facebook.react.turbomodule.core; import com.facebook.jni.HybridData; -import com.facebook.react.turbomodule.core.interfaces.JSCallInvokerHolder; +import com.facebook.react.turbomodule.core.interfaces.CallInvokerHolder; import com.facebook.soloader.SoLoader; /** @@ -15,14 +15,14 @@ import com.facebook.soloader.SoLoader; * TurboModuleManager. Therefore, we need to wrap JSCallInvoker within a hybrid class so that we may * pass it from CatalystInstance, through Java, to TurboModuleManager::initHybrid. */ -public class JSCallInvokerHolderImpl implements JSCallInvokerHolder { +public class CallInvokerHolderImpl implements CallInvokerHolder { static { SoLoader.loadLibrary("turbomodulejsijni"); } private final HybridData mHybridData; - private JSCallInvokerHolderImpl(HybridData hd) { + private CallInvokerHolderImpl(HybridData hd) { mHybridData = hd; } } diff --git a/ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/TurboModuleManager.java b/ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/TurboModuleManager.java index c81132e7ec7..b8a5b1a02d7 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/TurboModuleManager.java +++ b/ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/TurboModuleManager.java @@ -12,7 +12,7 @@ import com.facebook.proguard.annotations.DoNotStrip; import com.facebook.react.bridge.JSIModule; import com.facebook.react.bridge.JavaScriptContextHolder; import com.facebook.react.bridge.NativeModule; -import com.facebook.react.turbomodule.core.interfaces.JSCallInvokerHolder; +import com.facebook.react.turbomodule.core.interfaces.CallInvokerHolder; import com.facebook.react.turbomodule.core.interfaces.TurboModule; import com.facebook.react.turbomodule.core.interfaces.TurboModuleRegistry; import com.facebook.soloader.SoLoader; @@ -39,9 +39,8 @@ public class TurboModuleManager implements JSIModule, TurboModuleRegistry { public TurboModuleManager( JavaScriptContextHolder jsContext, TurboModuleManagerDelegate tmmDelegate, - JSCallInvokerHolder instanceHolder) { - mHybridData = - initHybrid(jsContext.get(), (JSCallInvokerHolderImpl) instanceHolder, tmmDelegate); + CallInvokerHolder instanceHolder) { + mHybridData = initHybrid(jsContext.get(), (CallInvokerHolderImpl) instanceHolder, tmmDelegate); mTurbomoduleManagerDelegate = tmmDelegate; } @@ -79,7 +78,7 @@ public class TurboModuleManager implements JSIModule, TurboModuleRegistry { } private native HybridData initHybrid( - long jsContext, JSCallInvokerHolderImpl jsQueue, TurboModuleManagerDelegate tmmDelegate); + long jsContext, CallInvokerHolderImpl jsQueue, TurboModuleManagerDelegate tmmDelegate); private native void installJSIBindings(); diff --git a/ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/interfaces/JSCallInvokerHolder.java b/ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/interfaces/CallInvokerHolder.java similarity index 60% rename from ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/interfaces/JSCallInvokerHolder.java rename to ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/interfaces/CallInvokerHolder.java index 3f39ff60e75..d47ac9b4ae9 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/interfaces/JSCallInvokerHolder.java +++ b/ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/interfaces/CallInvokerHolder.java @@ -7,11 +7,11 @@ package com.facebook.react.turbomodule.core.interfaces; /** - * JSCallInvoker is created by CatalystInstance.cpp, but used by TurboModuleManager.cpp. Both C++ - * classes are instantiated at different times/places. Therefore, to pass the JSCallInvoker instance - * from CatalystInstance to TurboModuleManager, we make it take a trip through Java. + * JS CallInvoker is created by CatalystInstance.cpp, but used by TurboModuleManager.cpp. Both C++ + * classes are instantiated at different times/places. Therefore, to pass the JS CallInvoker + * instance from CatalystInstance to TurboModuleManager, we make it take a trip through Java. * *

This interface represents the opaque Java object that contains a pointer to and instance of - * JSCallInvoker. + * CallInvoker. */ -public interface JSCallInvokerHolder {} +public interface CallInvokerHolder {} diff --git a/ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/jni/Android.mk b/ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/jni/Android.mk index bb23db1b27a..16329ccf65c 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/jni/Android.mk +++ b/ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/jni/Android.mk @@ -15,15 +15,15 @@ LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH) LOCAL_CFLAGS += -fexceptions -frtti -std=c++14 -Wall -LOCAL_STATIC_LIBRARIES = libjscallinvoker +LOCAL_STATIC_LIBRARIES = libcallinvoker LOCAL_SHARED_LIBRARIES = libfb # Name of this module. -LOCAL_MODULE := jscallinvokerholder +LOCAL_MODULE := callinvokerholder # Compile all local c++ files -LOCAL_SRC_FILES := $(LOCAL_PATH)/ReactCommon/JSCallInvokerHolder.cpp +LOCAL_SRC_FILES := $(LOCAL_PATH)/ReactCommon/CallInvokerHolder.cpp # Build the files in this directory as a shared library include $(BUILD_STATIC_LIBRARY) diff --git a/ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/jni/BUCK b/ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/jni/BUCK index b7d464ee5be..7fbc3fb8836 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/jni/BUCK +++ b/ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/jni/BUCK @@ -32,19 +32,19 @@ rn_xplat_cxx_library( ], exported_deps = [ "fbsource//xplat/jsi:jsi", - ":jscallinvokerholder", + ":callinvokerholder", react_native_xplat_target("turbomodule/core:core"), ], ) rn_xplat_cxx_library( - name = "jscallinvokerholder", + name = "callinvokerholder", srcs = [ - "ReactCommon/JSCallInvokerHolder.cpp", + "ReactCommon/CallInvokerHolder.cpp", ], header_namespace = "", exported_headers = { - "ReactCommon/JSCallInvokerHolder.h": "ReactCommon/JSCallInvokerHolder.h", + "ReactCommon/CallInvokerHolder.h": "ReactCommon/CallInvokerHolder.h", }, compiler_flags = [ "-fexceptions", @@ -65,6 +65,6 @@ rn_xplat_cxx_library( "PUBLIC", ], exported_deps = [ - react_native_xplat_target("jscallinvoker:jscallinvoker"), + react_native_xplat_target("callinvoker:callinvoker"), ], ) diff --git a/ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/jni/ReactCommon/CallInvokerHolder.cpp b/ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/jni/ReactCommon/CallInvokerHolder.cpp new file mode 100644 index 00000000000..af097151cd2 --- /dev/null +++ b/ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/jni/ReactCommon/CallInvokerHolder.cpp @@ -0,0 +1,17 @@ +#include "CallInvokerHolder.h" + +namespace facebook { +namespace react { + +CallInvokerHolder::CallInvokerHolder( + std::shared_ptr callInvoker) + : _callInvoker(callInvoker) {} + +std::shared_ptr CallInvokerHolder::getCallInvoker() { + return _callInvoker; +} + +void CallInvokerHolder::registerNatives() {} + +} // namespace react +} // namespace facebook diff --git a/ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/jni/ReactCommon/JSCallInvokerHolder.h b/ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/jni/ReactCommon/CallInvokerHolder.h similarity index 55% rename from ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/jni/ReactCommon/JSCallInvokerHolder.h rename to ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/jni/ReactCommon/CallInvokerHolder.h index 028f86e2c0e..ef9100799e6 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/jni/ReactCommon/JSCallInvokerHolder.h +++ b/ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/jni/ReactCommon/CallInvokerHolder.h @@ -8,25 +8,25 @@ #pragma once #include -#include +#include #include namespace facebook { namespace react { -class JSCallInvokerHolder - : public jni::HybridClass { +class CallInvokerHolder + : public jni::HybridClass { public: static auto constexpr kJavaDescriptor = - "Lcom/facebook/react/turbomodule/core/JSCallInvokerHolderImpl;"; + "Lcom/facebook/react/turbomodule/core/CallInvokerHolderImpl;"; static void registerNatives(); - std::shared_ptr getJSCallInvoker(); + std::shared_ptr getCallInvoker(); private: friend HybridBase; - JSCallInvokerHolder(std::shared_ptr jsCallInvoker); - std::shared_ptr _jsCallInvoker; + CallInvokerHolder(std::shared_ptr callInvoker); + std::shared_ptr _callInvoker; }; } // namespace react diff --git a/ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/jni/ReactCommon/JSCallInvokerHolder.cpp b/ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/jni/ReactCommon/JSCallInvokerHolder.cpp deleted file mode 100644 index b23912b5a0b..00000000000 --- a/ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/jni/ReactCommon/JSCallInvokerHolder.cpp +++ /dev/null @@ -1,17 +0,0 @@ -#include "JSCallInvokerHolder.h" - -namespace facebook { -namespace react { - -JSCallInvokerHolder::JSCallInvokerHolder( - std::shared_ptr jsCallInvoker) - : _jsCallInvoker(jsCallInvoker) {} - -std::shared_ptr JSCallInvokerHolder::getJSCallInvoker() { - return _jsCallInvoker; -} - -void JSCallInvokerHolder::registerNatives() {} - -} // namespace react -} // namespace facebook diff --git a/ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/jni/ReactCommon/TurboModuleManager.cpp b/ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/jni/ReactCommon/TurboModuleManager.cpp index 2f349c1b3c1..0028efe6e2f 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/jni/ReactCommon/TurboModuleManager.cpp +++ b/ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/jni/ReactCommon/TurboModuleManager.cpp @@ -23,7 +23,7 @@ namespace react { TurboModuleManager::TurboModuleManager( jni::alias_ref jThis, jsi::Runtime* rt, - std::shared_ptr jsCallInvoker, + std::shared_ptr jsCallInvoker, jni::alias_ref delegate ): javaPart_(jni::make_global(jThis)), @@ -35,10 +35,10 @@ TurboModuleManager::TurboModuleManager( jni::local_ref TurboModuleManager::initHybrid( jni::alias_ref jThis, jlong jsContext, - jni::alias_ref jsCallInvokerHolder, + jni::alias_ref jsCallInvokerHolder, jni::alias_ref delegate ) { - auto jsCallInvoker = jsCallInvokerHolder->cthis()->getJSCallInvoker(); + auto jsCallInvoker = jsCallInvokerHolder->cthis()->getCallInvoker(); return makeCxxInstance(jThis, (jsi::Runtime *) jsContext, jsCallInvoker, delegate); } diff --git a/ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/jni/ReactCommon/TurboModuleManager.h b/ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/jni/ReactCommon/TurboModuleManager.h index f72d8d4c955..9e524f63689 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/jni/ReactCommon/TurboModuleManager.h +++ b/ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/jni/ReactCommon/TurboModuleManager.h @@ -15,7 +15,7 @@ #include #include #include -#include +#include #include namespace facebook { @@ -27,7 +27,7 @@ public: static jni::local_ref initHybrid( jni::alias_ref jThis, jlong jsContext, - jni::alias_ref jsCallInvokerHolder, + jni::alias_ref jsCallInvokerHolder, jni::alias_ref delegate ); static void registerNatives(); @@ -35,7 +35,7 @@ private: friend HybridBase; jni::global_ref javaPart_; jsi::Runtime* runtime_; - std::shared_ptr jsCallInvoker_; + std::shared_ptr jsCallInvoker_; jni::global_ref delegate_; /** @@ -50,7 +50,7 @@ private: explicit TurboModuleManager( jni::alias_ref jThis, jsi::Runtime *rt, - std::shared_ptr jsCallInvoker, + std::shared_ptr jsCallInvoker, jni::alias_ref delegate ); }; diff --git a/ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/jni/ReactCommon/TurboModuleManagerDelegate.h b/ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/jni/ReactCommon/TurboModuleManagerDelegate.h index 1732e82202d..b8c7d5718f2 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/jni/ReactCommon/TurboModuleManagerDelegate.h +++ b/ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/jni/ReactCommon/TurboModuleManagerDelegate.h @@ -9,7 +9,7 @@ #include #include -#include +#include #include #include @@ -20,8 +20,8 @@ class TurboModuleManagerDelegate : public jni::HybridClass getTurboModule(std::string name, jni::alias_ref turboModule, std::shared_ptr jsInvoker) = 0; - virtual std::shared_ptr getTurboModule(std::string name, std::shared_ptr jsInvoker) = 0; + virtual std::shared_ptr getTurboModule(std::string name, jni::alias_ref turboModule, std::shared_ptr jsInvoker) = 0; + virtual std::shared_ptr getTurboModule(std::string name, std::shared_ptr jsInvoker) = 0; private: friend HybridBase; diff --git a/ReactAndroid/src/main/jni/react/jni/Android.mk b/ReactAndroid/src/main/jni/react/jni/Android.mk index cb88bb84c1d..9b8823cb92b 100644 --- a/ReactAndroid/src/main/jni/react/jni/Android.mk +++ b/ReactAndroid/src/main/jni/react/jni/Android.mk @@ -25,7 +25,7 @@ LOCAL_LDLIBS += -landroid LOCAL_SHARED_LIBRARIES := libfolly_json libfb libglog_init libyoga # The static libraries (.a files) that this module depends on. -LOCAL_STATIC_LIBRARIES := libreactnative libjscallinvokerholder +LOCAL_STATIC_LIBRARIES := libreactnative libcallinvokerholder # Name of this module. # @@ -67,7 +67,7 @@ $(call import-module,yogajni) $(call import-module,cxxreact) $(call import-module,jsi) $(call import-module,jsiexecutor) -$(call import-module,jscallinvoker) +$(call import-module,callinvoker) $(call import-module,hermes) include $(REACT_SRC_DIR)/turbomodule/core/jni/Android.mk diff --git a/ReactAndroid/src/main/jni/react/jni/BUCK b/ReactAndroid/src/main/jni/react/jni/BUCK index 537fa55da78..46df994c535 100644 --- a/ReactAndroid/src/main/jni/react/jni/BUCK +++ b/ReactAndroid/src/main/jni/react/jni/BUCK @@ -58,7 +58,7 @@ rn_xplat_cxx_library( "fbsource//xplat/folly:molly", "//fbandroid/xplat/fbgloginit:fbgloginit", "fbsource//xplat/fbsystrace:fbsystrace", - react_native_target("java/com/facebook/react/turbomodule/core/jni:jscallinvokerholder"), + react_native_target("java/com/facebook/react/turbomodule/core/jni:callinvokerholder"), react_native_xplat_target("cxxreact:bridge"), react_native_xplat_target("cxxreact:jsbigstring"), react_native_xplat_target("cxxreact:module"), diff --git a/ReactAndroid/src/main/jni/react/jni/CatalystInstanceImpl.cpp b/ReactAndroid/src/main/jni/react/jni/CatalystInstanceImpl.cpp index 1f03c154ae8..ceb0caeda96 100644 --- a/ReactAndroid/src/main/jni/react/jni/CatalystInstanceImpl.cpp +++ b/ReactAndroid/src/main/jni/react/jni/CatalystInstanceImpl.cpp @@ -10,7 +10,7 @@ #include #include -#include +#include #include #include #include @@ -281,12 +281,12 @@ void CatalystInstanceImpl::handleMemoryPressure(int pressureLevel) { instance_->handleMemoryPressure(pressureLevel); } -jni::alias_ref +jni::alias_ref CatalystInstanceImpl::getJSCallInvokerHolder() { if (!javaInstanceHolder_) { jsCallInvoker_ = std::make_shared(instance_); javaInstanceHolder_ = - jni::make_global(JSCallInvokerHolder::newObjectCxxArgs(jsCallInvoker_)); + jni::make_global(CallInvokerHolder::newObjectCxxArgs(jsCallInvoker_)); } return javaInstanceHolder_; diff --git a/ReactAndroid/src/main/jni/react/jni/CatalystInstanceImpl.h b/ReactAndroid/src/main/jni/react/jni/CatalystInstanceImpl.h index 6c39ae90f5c..a8f7238c8d6 100644 --- a/ReactAndroid/src/main/jni/react/jni/CatalystInstanceImpl.h +++ b/ReactAndroid/src/main/jni/react/jni/CatalystInstanceImpl.h @@ -6,7 +6,7 @@ #include #include -#include +#include #include #include @@ -89,7 +89,7 @@ class CatalystInstanceImpl : public jni::HybridClass { std::string method, NativeArray *arguments); void jniCallJSCallback(jint callbackId, NativeArray *arguments); - jni::alias_ref getJSCallInvokerHolder(); + jni::alias_ref getJSCallInvokerHolder(); void setGlobalVariable(std::string propName, std::string &&jsonValue); jlong getJavaScriptContext(); void handleMemoryPressure(int pressureLevel); @@ -99,7 +99,7 @@ class CatalystInstanceImpl : public jni::HybridClass { std::shared_ptr instance_; std::shared_ptr moduleRegistry_; std::shared_ptr moduleMessageQueue_; - jni::global_ref javaInstanceHolder_; + jni::global_ref javaInstanceHolder_; std::shared_ptr jsCallInvoker_; }; diff --git a/ReactCommon/ReactCommon.podspec b/ReactCommon/ReactCommon.podspec index 578e7568629..d46637308b4 100644 --- a/ReactCommon/ReactCommon.podspec +++ b/ReactCommon/ReactCommon.podspec @@ -37,8 +37,8 @@ Pod::Spec.new do |s| "USE_HEADERMAP" => "YES", "CLANG_CXX_LANGUAGE_STANDARD" => "c++14" } - s.subspec "jscallinvoker" do |ss| - ss.source_files = "jscallinvoker/**/*.{cpp,h}" + s.subspec "callinvoker" do |ss| + ss.source_files = "callinvoker/**/*.{cpp,h}" ss.dependency "React-cxxreact", version ss.dependency "DoubleConversion" @@ -47,7 +47,7 @@ Pod::Spec.new do |s| end s.subspec "turbomodule" do |ss| - ss.dependency "ReactCommon/jscallinvoker", version + ss.dependency "ReactCommon/callinvoker", version ss.dependency "React-Core", version ss.dependency "React-cxxreact", version ss.dependency "React-jsi", version diff --git a/ReactCommon/jscallinvoker/Android.mk b/ReactCommon/callinvoker/Android.mk similarity index 96% rename from ReactCommon/jscallinvoker/Android.mk rename to ReactCommon/callinvoker/Android.mk index c6718fd9b00..a088e119c65 100644 --- a/ReactCommon/jscallinvoker/Android.mk +++ b/ReactCommon/callinvoker/Android.mk @@ -18,7 +18,7 @@ LOCAL_CFLAGS += -fexceptions -frtti -std=c++14 -Wall LOCAL_STATIC_LIBRARIES = libreactnative # Name of this module. -LOCAL_MODULE := jscallinvoker +LOCAL_MODULE := callinvoker # Compile all local c++ files under ./ReactCommon LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/ReactCommon/*.cpp) diff --git a/ReactCommon/jscallinvoker/BUCK b/ReactCommon/callinvoker/BUCK similarity index 96% rename from ReactCommon/jscallinvoker/BUCK rename to ReactCommon/callinvoker/BUCK index a4a01df4e42..56a2317f3f5 100644 --- a/ReactCommon/jscallinvoker/BUCK +++ b/ReactCommon/callinvoker/BUCK @@ -1,7 +1,7 @@ load("//tools/build_defs/oss:rn_defs.bzl", "ANDROID", "APPLE", "react_native_xplat_target", "rn_xplat_cxx_library", "subdir_glob") rn_xplat_cxx_library( - name = "jscallinvoker", + name = "callinvoker", srcs = glob(["**/*.cpp"]), header_namespace = "", exported_headers = subdir_glob( diff --git a/ReactCommon/jscallinvoker/ReactCommon/BridgeJSCallInvoker.cpp b/ReactCommon/callinvoker/ReactCommon/BridgeJSCallInvoker.cpp similarity index 100% rename from ReactCommon/jscallinvoker/ReactCommon/BridgeJSCallInvoker.cpp rename to ReactCommon/callinvoker/ReactCommon/BridgeJSCallInvoker.cpp diff --git a/ReactCommon/jscallinvoker/ReactCommon/BridgeJSCallInvoker.h b/ReactCommon/callinvoker/ReactCommon/BridgeJSCallInvoker.h similarity index 91% rename from ReactCommon/jscallinvoker/ReactCommon/BridgeJSCallInvoker.h rename to ReactCommon/callinvoker/ReactCommon/BridgeJSCallInvoker.h index 4b21100b25f..1eee4a75d24 100644 --- a/ReactCommon/jscallinvoker/ReactCommon/BridgeJSCallInvoker.h +++ b/ReactCommon/callinvoker/ReactCommon/BridgeJSCallInvoker.h @@ -10,7 +10,7 @@ #include #include -#include +#include namespace facebook { namespace react { @@ -27,7 +27,7 @@ class Instance; * API to call JS from native, whether synchronously or asynchronously. * Also, this class should not depend on `Instance` in the future. */ -class BridgeJSCallInvoker : public JSCallInvoker { +class BridgeJSCallInvoker : public CallInvoker { public: BridgeJSCallInvoker(std::weak_ptr reactInstance); diff --git a/ReactCommon/jscallinvoker/ReactCommon/JSCallInvoker.h b/ReactCommon/callinvoker/ReactCommon/CallInvoker.h similarity index 91% rename from ReactCommon/jscallinvoker/ReactCommon/JSCallInvoker.h rename to ReactCommon/callinvoker/ReactCommon/CallInvoker.h index 501a32e7569..7381f42f75e 100644 --- a/ReactCommon/jscallinvoker/ReactCommon/JSCallInvoker.h +++ b/ReactCommon/callinvoker/ReactCommon/CallInvoker.h @@ -17,11 +17,11 @@ namespace react { * An interface for a generic native-to-JS call invoker. See BridgeJSCallInvoker * for an implementation. */ -class JSCallInvoker { +class CallInvoker { public: virtual void invokeAsync(std::function &&func) = 0; // TODO: add sync support - virtual ~JSCallInvoker() {} + virtual ~CallInvoker() {} }; } // namespace react diff --git a/ReactCommon/turbomodule/core/BUCK b/ReactCommon/turbomodule/core/BUCK index cb5ceb85629..74d4ae35bf6 100644 --- a/ReactCommon/turbomodule/core/BUCK +++ b/ReactCommon/turbomodule/core/BUCK @@ -78,7 +78,7 @@ rn_xplat_cxx_library( "fbsource//xplat/third-party/glog:glog", react_native_xplat_target("cxxreact:bridge"), react_native_xplat_target("cxxreact:module"), - react_native_xplat_target("jscallinvoker:jscallinvoker"), + react_native_xplat_target("callinvoker:callinvoker"), ], exported_deps = [ "fbsource//xplat/jsi:jsi", diff --git a/ReactCommon/turbomodule/core/TurboCxxModule.cpp b/ReactCommon/turbomodule/core/TurboCxxModule.cpp index 267b5179edb..b283c461580 100644 --- a/ReactCommon/turbomodule/core/TurboCxxModule.cpp +++ b/ReactCommon/turbomodule/core/TurboCxxModule.cpp @@ -38,7 +38,7 @@ static CxxModule::Callback makeTurboCxxModuleCallback( TurboCxxModule::TurboCxxModule( std::unique_ptr cxxModule, - std::shared_ptr jsInvoker) + std::shared_ptr jsInvoker) : TurboModule(cxxModule->getName(), jsInvoker), cxxMethods_(cxxModule->getMethods()), cxxModule_(std::move(cxxModule)) {} diff --git a/ReactCommon/turbomodule/core/TurboCxxModule.h b/ReactCommon/turbomodule/core/TurboCxxModule.h index 509ae8d2dd5..b790b1c9c07 100644 --- a/ReactCommon/turbomodule/core/TurboCxxModule.h +++ b/ReactCommon/turbomodule/core/TurboCxxModule.h @@ -27,7 +27,7 @@ class JSI_EXPORT TurboCxxModule : public TurboModule { public: TurboCxxModule( std::unique_ptr cxxModule, - std::shared_ptr jsInvoker); + std::shared_ptr jsInvoker); virtual facebook::jsi::Value get( facebook::jsi::Runtime &runtime, diff --git a/ReactCommon/turbomodule/core/TurboModule.cpp b/ReactCommon/turbomodule/core/TurboModule.cpp index 06a032dc93c..6247bf99fe4 100644 --- a/ReactCommon/turbomodule/core/TurboModule.cpp +++ b/ReactCommon/turbomodule/core/TurboModule.cpp @@ -14,7 +14,7 @@ namespace react { TurboModule::TurboModule( const std::string &name, - std::shared_ptr jsInvoker) + std::shared_ptr jsInvoker) : name_(name), jsInvoker_(jsInvoker) {} TurboModule::~TurboModule() {} diff --git a/ReactCommon/turbomodule/core/TurboModule.h b/ReactCommon/turbomodule/core/TurboModule.h index 69cb19ed79f..c588ac4a658 100644 --- a/ReactCommon/turbomodule/core/TurboModule.h +++ b/ReactCommon/turbomodule/core/TurboModule.h @@ -12,7 +12,7 @@ #include -#include +#include namespace facebook { namespace react { @@ -37,9 +37,7 @@ enum TurboModuleMethodValueKind { */ class JSI_EXPORT TurboModule : public facebook::jsi::HostObject { public: - TurboModule( - const std::string &name, - std::shared_ptr jsInvoker); + TurboModule(const std::string &name, std::shared_ptr jsInvoker); virtual ~TurboModule(); virtual facebook::jsi::Value get( @@ -47,7 +45,7 @@ class JSI_EXPORT TurboModule : public facebook::jsi::HostObject { const facebook::jsi::PropNameID &propName) override; const std::string name_; - std::shared_ptr jsInvoker_; + std::shared_ptr jsInvoker_; protected: struct MethodMetadata { diff --git a/ReactCommon/turbomodule/core/TurboModuleUtils.h b/ReactCommon/turbomodule/core/TurboModuleUtils.h index 8a99908c1a3..55b7b147ae1 100644 --- a/ReactCommon/turbomodule/core/TurboModuleUtils.h +++ b/ReactCommon/turbomodule/core/TurboModuleUtils.h @@ -13,7 +13,7 @@ #include #include -#include +#include #include using namespace facebook; @@ -49,14 +49,14 @@ class CallbackWrapper : public LongLivedObject { Data( jsi::Function callback, jsi::Runtime &runtime, - std::shared_ptr jsInvoker) + std::shared_ptr jsInvoker) : callback(std::move(callback)), runtime(runtime), jsInvoker(std::move(jsInvoker)) {} jsi::Function callback; jsi::Runtime &runtime; - std::shared_ptr jsInvoker; + std::shared_ptr jsInvoker; }; folly::Optional data_; @@ -65,7 +65,7 @@ class CallbackWrapper : public LongLivedObject { static std::weak_ptr createWeak( jsi::Function callback, jsi::Runtime &runtime, - std::shared_ptr jsInvoker) { + std::shared_ptr jsInvoker) { auto wrapper = std::make_shared( std::move(callback), runtime, jsInvoker); LongLivedObjectCollection::get().add(wrapper); @@ -75,7 +75,7 @@ class CallbackWrapper : public LongLivedObject { CallbackWrapper( jsi::Function callback, jsi::Runtime &runtime, - std::shared_ptr jsInvoker) + std::shared_ptr jsInvoker) : data_(Data{std::move(callback), runtime, jsInvoker}) {} // Delete the enclosed jsi::Function @@ -98,7 +98,7 @@ class CallbackWrapper : public LongLivedObject { return data_->runtime; } - react::JSCallInvoker &jsInvoker() { + react::CallInvoker &jsInvoker() { assert(!isDestroyed()); return *(data_->jsInvoker); } diff --git a/ReactCommon/turbomodule/core/platform/android/JavaTurboModule.cpp b/ReactCommon/turbomodule/core/platform/android/JavaTurboModule.cpp index 21b0287e779..ce7e0d2a01f 100644 --- a/ReactCommon/turbomodule/core/platform/android/JavaTurboModule.cpp +++ b/ReactCommon/turbomodule/core/platform/android/JavaTurboModule.cpp @@ -26,14 +26,14 @@ namespace react { JavaTurboModule::JavaTurboModule( const std::string &name, jni::alias_ref instance, - std::shared_ptr jsInvoker) + std::shared_ptr jsInvoker) : TurboModule(name, jsInvoker), instance_(jni::make_global(instance)) {} jni::local_ref JavaTurboModule::createJavaCallbackFromJSIFunction( jsi::Function &function, jsi::Runtime &rt, - std::shared_ptr jsInvoker) { + std::shared_ptr jsInvoker) { auto wrapper = std::make_shared( std::move(function), rt, jsInvoker); callbackWrappers_.insert(wrapper); @@ -223,7 +223,7 @@ std::vector JavaTurboModule::convertJSIArgsToJNIArgs( std::vector methodArgTypes, const jsi::Value *args, size_t count, - std::shared_ptr jsInvoker, + std::shared_ptr jsInvoker, TurboModuleMethodValueKind valueKind) { unsigned int expectedArgumentCount = valueKind == PromiseKind ? methodArgTypes.size() - 1 diff --git a/ReactCommon/turbomodule/core/platform/android/JavaTurboModule.h b/ReactCommon/turbomodule/core/platform/android/JavaTurboModule.h index a63cc4c57e1..90056eb3c73 100644 --- a/ReactCommon/turbomodule/core/platform/android/JavaTurboModule.h +++ b/ReactCommon/turbomodule/core/platform/android/JavaTurboModule.h @@ -29,7 +29,7 @@ class JSI_EXPORT JavaTurboModule : public TurboModule { JavaTurboModule( const std::string &name, jni::alias_ref instance, - std::shared_ptr jsInvoker); + std::shared_ptr jsInvoker); jsi::Value invokeJavaMethod( jsi::Runtime &runtime, TurboModuleMethodValueKind valueKind, @@ -56,7 +56,7 @@ class JSI_EXPORT JavaTurboModule : public TurboModule { jni::local_ref createJavaCallbackFromJSIFunction( jsi::Function &function, jsi::Runtime &rt, - std::shared_ptr jsInvoker); + std::shared_ptr jsInvoker); std::vector convertJSIArgsToJNIArgs( JNIEnv *env, jsi::Runtime &rt, @@ -64,7 +64,7 @@ class JSI_EXPORT JavaTurboModule : public TurboModule { std::vector methodArgTypes, const jsi::Value *args, size_t count, - std::shared_ptr jsInvoker, + std::shared_ptr jsInvoker, TurboModuleMethodValueKind valueKind); }; diff --git a/ReactCommon/turbomodule/core/platform/ios/RCTTurboModule.h b/ReactCommon/turbomodule/core/platform/ios/RCTTurboModule.h index b9811500536..57d6d2fe47f 100644 --- a/ReactCommon/turbomodule/core/platform/ios/RCTTurboModule.h +++ b/ReactCommon/turbomodule/core/platform/ios/RCTTurboModule.h @@ -12,7 +12,7 @@ #import #import #import -#import +#import #import #import #import @@ -33,7 +33,7 @@ class Instance; */ class JSI_EXPORT ObjCTurboModule : public TurboModule { public: - ObjCTurboModule(const std::string &name, id instance, std::shared_ptr jsInvoker); + ObjCTurboModule(const std::string &name, id instance, std::shared_ptr jsInvoker); jsi::Value invokeObjCMethod( jsi::Runtime &runtime, @@ -61,7 +61,7 @@ class JSI_EXPORT ObjCTurboModule : public TurboModule { jsi::Runtime &runtime, TurboModuleMethodValueKind valueKind, const id module, - std::shared_ptr jsInvoker, + std::shared_ptr jsInvoker, const std::string &methodName, SEL selector, const jsi::Value *args, @@ -74,7 +74,7 @@ class JSI_EXPORT ObjCTurboModule : public TurboModule { using PromiseInvocationBlock = void (^)(jsi::Runtime &rt, RCTPromiseResolveBlock resolveWrapper, RCTPromiseRejectBlock rejectWrapper); jsi::Value - createPromise(jsi::Runtime &runtime, std::shared_ptr jsInvoker, PromiseInvocationBlock invoke); + createPromise(jsi::Runtime &runtime, std::shared_ptr jsInvoker, PromiseInvocationBlock invoke); }; } // namespace react @@ -94,7 +94,7 @@ class JSI_EXPORT ObjCTurboModule : public TurboModule { @optional // This should be required, after migration is done. - (std::shared_ptr)getTurboModuleWithJsInvoker: - (std::shared_ptr)jsInvoker; + (std::shared_ptr)jsInvoker; @end diff --git a/ReactCommon/turbomodule/core/platform/ios/RCTTurboModule.mm b/ReactCommon/turbomodule/core/platform/ios/RCTTurboModule.mm index a93a08eb393..e2b72e1a9da 100644 --- a/ReactCommon/turbomodule/core/platform/ios/RCTTurboModule.mm +++ b/ReactCommon/turbomodule/core/platform/ios/RCTTurboModule.mm @@ -18,7 +18,7 @@ #import #import #import -#import +#import #import #import #import @@ -93,16 +93,14 @@ static jsi::Value convertObjCObjectToJSIValue(jsi::Runtime &runtime, id value) static id convertJSIValueToObjCObject( jsi::Runtime &runtime, const jsi::Value &value, - std::shared_ptr jsInvoker); + std::shared_ptr jsInvoker); static NSString *convertJSIStringToNSString(jsi::Runtime &runtime, const jsi::String &value) { return [NSString stringWithUTF8String:value.utf8(runtime).c_str()]; } -static NSArray *convertJSIArrayToNSArray( - jsi::Runtime &runtime, - const jsi::Array &value, - std::shared_ptr jsInvoker) +static NSArray * +convertJSIArrayToNSArray(jsi::Runtime &runtime, const jsi::Array &value, std::shared_ptr jsInvoker) { size_t size = value.size(runtime); NSMutableArray *result = [NSMutableArray new]; @@ -117,7 +115,7 @@ static NSArray *convertJSIArrayToNSArray( static NSDictionary *convertJSIObjectToNSDictionary( jsi::Runtime &runtime, const jsi::Object &value, - std::shared_ptr jsInvoker) + std::shared_ptr jsInvoker) { jsi::Array propertyNames = value.getPropertyNames(runtime); size_t size = propertyNames.size(runtime); @@ -136,11 +134,11 @@ static NSDictionary *convertJSIObjectToNSDictionary( static RCTResponseSenderBlock convertJSIFunctionToCallback( jsi::Runtime &runtime, const jsi::Function &value, - std::shared_ptr jsInvoker); + std::shared_ptr jsInvoker); static id convertJSIValueToObjCObject( jsi::Runtime &runtime, const jsi::Value &value, - std::shared_ptr jsInvoker) + std::shared_ptr jsInvoker) { if (value.isUndefined() || value.isNull()) { return nil; @@ -171,7 +169,7 @@ static id convertJSIValueToObjCObject( static RCTResponseSenderBlock convertJSIFunctionToCallback( jsi::Runtime &runtime, const jsi::Function &value, - std::shared_ptr jsInvoker) + std::shared_ptr jsInvoker) { auto weakWrapper = react::CallbackWrapper::createWeak(value.getFunction(runtime), runtime, jsInvoker); BOOL __block wrapperWasCalled = NO; @@ -205,7 +203,7 @@ namespace react { jsi::Value ObjCTurboModule::createPromise( jsi::Runtime &runtime, - std::shared_ptr jsInvoker, + std::shared_ptr jsInvoker, PromiseInvocationBlock invoke) { if (!invoke) { @@ -328,7 +326,7 @@ jsi::Value performMethodInvocation( NSInvocation *inv, TurboModuleMethodValueKind valueKind, const id module, - std::shared_ptr jsInvoker, + std::shared_ptr jsInvoker, NSMutableArray *retainedObjectsForInvocation) { __block id result; @@ -464,7 +462,7 @@ NSInvocation *ObjCTurboModule::getMethodInvocation( jsi::Runtime &runtime, TurboModuleMethodValueKind valueKind, const id module, - std::shared_ptr jsInvoker, + std::shared_ptr jsInvoker, const std::string &methodName, SEL selector, const jsi::Value *args, @@ -601,7 +599,7 @@ NSInvocation *ObjCTurboModule::getMethodInvocation( ObjCTurboModule::ObjCTurboModule( const std::string &name, id instance, - std::shared_ptr jsInvoker) + std::shared_ptr jsInvoker) : TurboModule(name, jsInvoker), instance_(instance) { } diff --git a/ReactCommon/turbomodule/core/platform/ios/RCTTurboModuleManager.h b/ReactCommon/turbomodule/core/platform/ios/RCTTurboModuleManager.h index edca0c511e9..17caa91690f 100644 --- a/ReactCommon/turbomodule/core/platform/ios/RCTTurboModuleManager.h +++ b/ReactCommon/turbomodule/core/platform/ios/RCTTurboModuleManager.h @@ -13,7 +13,7 @@ - (std::shared_ptr)getTurboModule:(const std::string &)name instance:(id)instance jsInvoker: - (std::shared_ptr)jsInvoker; + (std::shared_ptr)jsInvoker; @optional @@ -32,7 +32,7 @@ */ - (std::shared_ptr)getTurboModule:(const std::string &)name jsInvoker: - (std::shared_ptr)jsInvoker; + (std::shared_ptr)jsInvoker; @end diff --git a/ReactCommon/turbomodule/core/platform/ios/RCTTurboModuleManager.mm b/ReactCommon/turbomodule/core/platform/ios/RCTTurboModuleManager.mm index f3273629fdc..c79431be8cf 100644 --- a/ReactCommon/turbomodule/core/platform/ios/RCTTurboModuleManager.mm +++ b/ReactCommon/turbomodule/core/platform/ios/RCTTurboModuleManager.mm @@ -35,7 +35,7 @@ static Class getFallbackClassFromName(const char *name) @implementation RCTTurboModuleManager { jsi::Runtime *_runtime; - std::shared_ptr _jsInvoker; + std::shared_ptr _jsInvoker; std::shared_ptr _binding; __weak id _delegate; __weak RCTBridge *_bridge; diff --git a/ReactCommon/turbomodule/samples/NativeSampleTurboCxxModuleSpecJSI.cpp b/ReactCommon/turbomodule/samples/NativeSampleTurboCxxModuleSpecJSI.cpp index 6abd8d63dc2..cceedb5e35c 100644 --- a/ReactCommon/turbomodule/samples/NativeSampleTurboCxxModuleSpecJSI.cpp +++ b/ReactCommon/turbomodule/samples/NativeSampleTurboCxxModuleSpecJSI.cpp @@ -113,7 +113,7 @@ static jsi::Value __hostFunction_NativeSampleTurboCxxModuleSpecJSI_getConstants( } NativeSampleTurboCxxModuleSpecJSI::NativeSampleTurboCxxModuleSpecJSI( - std::shared_ptr jsInvoker) + std::shared_ptr jsInvoker) : TurboModule("SampleTurboCxxModule", jsInvoker) { methodMap_["voidFunc"] = MethodMetadata{ 0, __hostFunction_NativeSampleTurboCxxModuleSpecJSI_voidFunc}; diff --git a/ReactCommon/turbomodule/samples/NativeSampleTurboCxxModuleSpecJSI.h b/ReactCommon/turbomodule/samples/NativeSampleTurboCxxModuleSpecJSI.h index 8c13283bb27..4611809c0aa 100644 --- a/ReactCommon/turbomodule/samples/NativeSampleTurboCxxModuleSpecJSI.h +++ b/ReactCommon/turbomodule/samples/NativeSampleTurboCxxModuleSpecJSI.h @@ -18,7 +18,7 @@ namespace react { // TODO: This definition should be codegen'ed for type-safety purpose. class JSI_EXPORT NativeSampleTurboCxxModuleSpecJSI : public TurboModule { protected: - NativeSampleTurboCxxModuleSpecJSI(std::shared_ptr jsInvoker); + NativeSampleTurboCxxModuleSpecJSI(std::shared_ptr jsInvoker); public: virtual void voidFunc(jsi::Runtime &rt) = 0; diff --git a/ReactCommon/turbomodule/samples/SampleTurboCxxModule.cpp b/ReactCommon/turbomodule/samples/SampleTurboCxxModule.cpp index 43e56752cda..40e5200abfc 100644 --- a/ReactCommon/turbomodule/samples/SampleTurboCxxModule.cpp +++ b/ReactCommon/turbomodule/samples/SampleTurboCxxModule.cpp @@ -15,7 +15,7 @@ namespace facebook { namespace react { SampleTurboCxxModule::SampleTurboCxxModule( - std::shared_ptr jsInvoker) + std::shared_ptr jsInvoker) : NativeSampleTurboCxxModuleSpecJSI(jsInvoker) {} void SampleTurboCxxModule::voidFunc(jsi::Runtime &rt) { diff --git a/ReactCommon/turbomodule/samples/SampleTurboCxxModule.h b/ReactCommon/turbomodule/samples/SampleTurboCxxModule.h index 6275b75e11d..d2276693a89 100644 --- a/ReactCommon/turbomodule/samples/SampleTurboCxxModule.h +++ b/ReactCommon/turbomodule/samples/SampleTurboCxxModule.h @@ -21,7 +21,7 @@ namespace react { */ class SampleTurboCxxModule : public NativeSampleTurboCxxModuleSpecJSI { public: - SampleTurboCxxModule(std::shared_ptr jsInvoker); + SampleTurboCxxModule(std::shared_ptr jsInvoker); void voidFunc(jsi::Runtime &rt) override; bool getBool(jsi::Runtime &rt, bool arg) override; diff --git a/ReactCommon/turbomodule/samples/platform/ios/RCTNativeSampleTurboModuleSpec.h b/ReactCommon/turbomodule/samples/platform/ios/RCTNativeSampleTurboModuleSpec.h index feca3f616a4..3077a0ab829 100644 --- a/ReactCommon/turbomodule/samples/platform/ios/RCTNativeSampleTurboModuleSpec.h +++ b/ReactCommon/turbomodule/samples/platform/ios/RCTNativeSampleTurboModuleSpec.h @@ -42,7 +42,7 @@ namespace react { */ class JSI_EXPORT NativeSampleTurboModuleSpecJSI : public ObjCTurboModule { public: - NativeSampleTurboModuleSpecJSI(id instance, std::shared_ptr jsInvoker); + NativeSampleTurboModuleSpecJSI(id instance, std::shared_ptr jsInvoker); }; } // namespace react diff --git a/ReactCommon/turbomodule/samples/platform/ios/RCTNativeSampleTurboModuleSpec.mm b/ReactCommon/turbomodule/samples/platform/ios/RCTNativeSampleTurboModuleSpec.mm index 24797a224e4..128ce1b4705 100644 --- a/ReactCommon/turbomodule/samples/platform/ios/RCTNativeSampleTurboModuleSpec.mm +++ b/ReactCommon/turbomodule/samples/platform/ios/RCTNativeSampleTurboModuleSpec.mm @@ -113,7 +113,7 @@ static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleSpecJSI_getCon NativeSampleTurboModuleSpecJSI::NativeSampleTurboModuleSpecJSI( id instance, - std::shared_ptr jsInvoker) + std::shared_ptr jsInvoker) : ObjCTurboModule("SampleTurboModule", instance, jsInvoker) { methodMap_["voidFunc"] = MethodMetadata{0, __hostFunction_NativeSampleTurboModuleSpecJSI_voidFunc}; diff --git a/ReactCommon/turbomodule/samples/platform/ios/RCTSampleTurboCxxModule.mm b/ReactCommon/turbomodule/samples/platform/ios/RCTSampleTurboCxxModule.mm index 59809377ed8..bb80f39a057 100644 --- a/ReactCommon/turbomodule/samples/platform/ios/RCTSampleTurboCxxModule.mm +++ b/ReactCommon/turbomodule/samples/platform/ios/RCTSampleTurboCxxModule.mm @@ -18,7 +18,7 @@ using namespace facebook; RCT_EXPORT_MODULE(); -- (std::shared_ptr)getTurboModuleWithJsInvoker:(std::shared_ptr)jsInvoker +- (std::shared_ptr)getTurboModuleWithJsInvoker:(std::shared_ptr)jsInvoker { return std::make_shared(jsInvoker); } diff --git a/ReactCommon/turbomodule/samples/platform/ios/RCTSampleTurboModule.mm b/ReactCommon/turbomodule/samples/platform/ios/RCTSampleTurboModule.mm index b66458bb897..66b51176e22 100644 --- a/ReactCommon/turbomodule/samples/platform/ios/RCTSampleTurboModule.mm +++ b/ReactCommon/turbomodule/samples/platform/ios/RCTSampleTurboModule.mm @@ -31,7 +31,7 @@ RCT_EXPORT_MODULE() } - (std::shared_ptr)getTurboModuleWithJsInvoker: - (std::shared_ptr)jsInvoker + (std::shared_ptr)jsInvoker { return std::make_shared(self, jsInvoker); } diff --git a/packages/react-native-codegen/src/generators/modules/GenerateModuleCpp.js b/packages/react-native-codegen/src/generators/modules/GenerateModuleCpp.js index 52b611455dc..dd2eb05858f 100644 --- a/packages/react-native-codegen/src/generators/modules/GenerateModuleCpp.js +++ b/packages/react-native-codegen/src/generators/modules/GenerateModuleCpp.js @@ -37,7 +37,7 @@ const proprertyDefTemplate = const moduleTemplate = ` ::_MODULE_PROPERTIES_:: -Native::_MODULE_NAME_::CxxSpecJSI::Native::_MODULE_NAME_::CxxSpecJSI(std::shared_ptr jsInvoker) +Native::_MODULE_NAME_::CxxSpecJSI::Native::_MODULE_NAME_::CxxSpecJSI(std::shared_ptr jsInvoker) : TurboModule("::_MODULE_NAME_::", jsInvoker) { ::_PROPERTIES_MAP_:: }`.trim(); diff --git a/packages/react-native-codegen/src/generators/modules/GenerateModuleH.js b/packages/react-native-codegen/src/generators/modules/GenerateModuleH.js index d7209593966..d731fe0a3cd 100644 --- a/packages/react-native-codegen/src/generators/modules/GenerateModuleH.js +++ b/packages/react-native-codegen/src/generators/modules/GenerateModuleH.js @@ -21,7 +21,7 @@ type FilesOutput = Map; const moduleTemplate = ` class JSI_EXPORT Native::_MODULE_NAME_::CxxSpecJSI : public TurboModule { protected: - Native::_MODULE_NAME_::CxxSpecJSI(std::shared_ptr jsInvoker); + Native::_MODULE_NAME_::CxxSpecJSI(std::shared_ptr jsInvoker); public: ::_MODULE_PROPERTIES_:: diff --git a/packages/react-native-codegen/src/generators/modules/GenerateModuleHObjCpp.js b/packages/react-native-codegen/src/generators/modules/GenerateModuleHObjCpp.js index 1d292bd1584..5cea4def8c7 100644 --- a/packages/react-native-codegen/src/generators/modules/GenerateModuleHObjCpp.js +++ b/packages/react-native-codegen/src/generators/modules/GenerateModuleHObjCpp.js @@ -27,7 +27,7 @@ type FilesOutput = Map; const moduleTemplate = ` class JSI_EXPORT Native::_MODULE_NAME_::SpecJSI : public ObjCTurboModule { public: - Native::_MODULE_NAME_::SpecJSI(id instance, std::shared_ptr jsInvoker); + Native::_MODULE_NAME_::SpecJSI(id instance, std::shared_ptr jsInvoker); };`; const protocolTemplate = ` diff --git a/packages/react-native-codegen/src/generators/modules/GenerateModuleMm.js b/packages/react-native-codegen/src/generators/modules/GenerateModuleMm.js index be980028816..da252113ffc 100644 --- a/packages/react-native-codegen/src/generators/modules/GenerateModuleMm.js +++ b/packages/react-native-codegen/src/generators/modules/GenerateModuleMm.js @@ -34,7 +34,7 @@ const proprertyDefTemplate = const moduleTemplate = ` ::_TURBOMODULE_METHOD_INVOKERS_:: -Native::_MODULE_NAME_::SpecJSI::Native::_MODULE_NAME_::SpecJSI(id instance, std::shared_ptr jsInvoker) +Native::_MODULE_NAME_::SpecJSI::Native::_MODULE_NAME_::SpecJSI(id instance, std::shared_ptr jsInvoker) : ObjCTurboModule("::_MODULE_NAME_::", instance, jsInvoker) { ::_PROPERTIES_MAP_::::_CONVERSION_SELECTORS_:: }`.trim(); diff --git a/packages/react-native-codegen/src/generators/modules/__tests__/__snapshots__/GenerateModuleCpp-test.js.snap b/packages/react-native-codegen/src/generators/modules/__tests__/__snapshots__/GenerateModuleCpp-test.js.snap index 4a617d755d4..dc3ddba143f 100644 --- a/packages/react-native-codegen/src/generators/modules/__tests__/__snapshots__/GenerateModuleCpp-test.js.snap +++ b/packages/react-native-codegen/src/generators/modules/__tests__/__snapshots__/GenerateModuleCpp-test.js.snap @@ -19,7 +19,7 @@ static jsi::Value __hostFunction_NativeSampleTurboModuleCxxSpecJSI_difficult(jsi return static_cast(&turboModule)->difficult(rt, args[0].getObject(rt)); } -NativeSampleTurboModuleCxxSpecJSI::NativeSampleTurboModuleCxxSpecJSI(std::shared_ptr jsInvoker) +NativeSampleTurboModuleCxxSpecJSI::NativeSampleTurboModuleCxxSpecJSI(std::shared_ptr jsInvoker) : TurboModule(\\"SampleTurboModule\\", jsInvoker) { methodMap_[\\"difficult\\"] = MethodMetadata {1, __hostFunction_NativeSampleTurboModuleCxxSpecJSI_difficult}; } @@ -48,7 +48,7 @@ namespace react { -NativeSampleTurboModuleCxxSpecJSI::NativeSampleTurboModuleCxxSpecJSI(std::shared_ptr jsInvoker) +NativeSampleTurboModuleCxxSpecJSI::NativeSampleTurboModuleCxxSpecJSI(std::shared_ptr jsInvoker) : TurboModule(\\"SampleTurboModule\\", jsInvoker) { } @@ -110,7 +110,7 @@ static jsi::Value __hostFunction_NativeSampleTurboModuleCxxSpecJSI_getValueWithP return static_cast(&turboModule)->getValueWithPromise(rt, args[0].getBool()); } -NativeSampleTurboModuleCxxSpecJSI::NativeSampleTurboModuleCxxSpecJSI(std::shared_ptr jsInvoker) +NativeSampleTurboModuleCxxSpecJSI::NativeSampleTurboModuleCxxSpecJSI(std::shared_ptr jsInvoker) : TurboModule(\\"SampleTurboModule\\", jsInvoker) { methodMap_[\\"getConstants\\"] = MethodMetadata {0, __hostFunction_NativeSampleTurboModuleCxxSpecJSI_getConstants}; methodMap_[\\"voidFunc\\"] = MethodMetadata {0, __hostFunction_NativeSampleTurboModuleCxxSpecJSI_voidFunc}; @@ -152,7 +152,7 @@ static jsi::Value __hostFunction_NativeSampleTurboModuleCxxSpecJSI_voidFunc(jsi: return jsi::Value::undefined(); } -NativeSampleTurboModuleCxxSpecJSI::NativeSampleTurboModuleCxxSpecJSI(std::shared_ptr jsInvoker) +NativeSampleTurboModuleCxxSpecJSI::NativeSampleTurboModuleCxxSpecJSI(std::shared_ptr jsInvoker) : TurboModule(\\"SampleTurboModule\\", jsInvoker) { methodMap_[\\"voidFunc\\"] = MethodMetadata {0, __hostFunction_NativeSampleTurboModuleCxxSpecJSI_voidFunc}; } @@ -165,7 +165,7 @@ static jsi::Value __hostFunction_NativeSample2TurboModuleCxxSpecJSI_voidFunc(jsi return jsi::Value::undefined(); } -NativeSample2TurboModuleCxxSpecJSI::NativeSample2TurboModuleCxxSpecJSI(std::shared_ptr jsInvoker) +NativeSample2TurboModuleCxxSpecJSI::NativeSample2TurboModuleCxxSpecJSI(std::shared_ptr jsInvoker) : TurboModule(\\"Sample2TurboModule\\", jsInvoker) { methodMap_[\\"getConstants\\"] = MethodMetadata {0, __hostFunction_NativeSample2TurboModuleCxxSpecJSI_getConstants}; methodMap_[\\"voidFunc\\"] = MethodMetadata {0, __hostFunction_NativeSample2TurboModuleCxxSpecJSI_voidFunc}; @@ -199,7 +199,7 @@ static jsi::Value __hostFunction_NativeSampleTurboModuleCxxSpecJSI_voidFunc(jsi: return jsi::Value::undefined(); } -NativeSampleTurboModuleCxxSpecJSI::NativeSampleTurboModuleCxxSpecJSI(std::shared_ptr jsInvoker) +NativeSampleTurboModuleCxxSpecJSI::NativeSampleTurboModuleCxxSpecJSI(std::shared_ptr jsInvoker) : TurboModule(\\"SampleTurboModule\\", jsInvoker) { methodMap_[\\"voidFunc\\"] = MethodMetadata {0, __hostFunction_NativeSampleTurboModuleCxxSpecJSI_voidFunc}; } @@ -209,7 +209,7 @@ static jsi::Value __hostFunction_NativeSample2TurboModuleCxxSpecJSI_voidFunc(jsi return jsi::Value::undefined(); } -NativeSample2TurboModuleCxxSpecJSI::NativeSample2TurboModuleCxxSpecJSI(std::shared_ptr jsInvoker) +NativeSample2TurboModuleCxxSpecJSI::NativeSample2TurboModuleCxxSpecJSI(std::shared_ptr jsInvoker) : TurboModule(\\"Sample2TurboModule\\", jsInvoker) { methodMap_[\\"voidFunc\\"] = MethodMetadata {0, __hostFunction_NativeSample2TurboModuleCxxSpecJSI_voidFunc}; } diff --git a/packages/react-native-codegen/src/generators/modules/__tests__/__snapshots__/GenerateModuleH-test.js.snap b/packages/react-native-codegen/src/generators/modules/__tests__/__snapshots__/GenerateModuleH-test.js.snap index f80f9bcc571..9a6328bbf10 100644 --- a/packages/react-native-codegen/src/generators/modules/__tests__/__snapshots__/GenerateModuleH-test.js.snap +++ b/packages/react-native-codegen/src/generators/modules/__tests__/__snapshots__/GenerateModuleH-test.js.snap @@ -19,7 +19,7 @@ namespace react { class JSI_EXPORT NativeSampleTurboModuleCxxSpecJSI : public TurboModule { protected: - NativeSampleTurboModuleCxxSpecJSI(std::shared_ptr jsInvoker); + NativeSampleTurboModuleCxxSpecJSI(std::shared_ptr jsInvoker); public: virtual jsi::Object difficult(jsi::Runtime &rt, const jsi::Object &A) = 0; @@ -51,7 +51,7 @@ namespace react { class JSI_EXPORT NativeSampleTurboModuleCxxSpecJSI : public TurboModule { protected: - NativeSampleTurboModuleCxxSpecJSI(std::shared_ptr jsInvoker); + NativeSampleTurboModuleCxxSpecJSI(std::shared_ptr jsInvoker); public: @@ -83,7 +83,7 @@ namespace react { class JSI_EXPORT NativeSampleTurboModuleCxxSpecJSI : public TurboModule { protected: - NativeSampleTurboModuleCxxSpecJSI(std::shared_ptr jsInvoker); + NativeSampleTurboModuleCxxSpecJSI(std::shared_ptr jsInvoker); public: virtual jsi::Object getConstants(jsi::Runtime &rt) = 0; @@ -124,7 +124,7 @@ namespace react { class JSI_EXPORT NativeSampleTurboModuleCxxSpecJSI : public TurboModule { protected: - NativeSampleTurboModuleCxxSpecJSI(std::shared_ptr jsInvoker); + NativeSampleTurboModuleCxxSpecJSI(std::shared_ptr jsInvoker); public: virtual void voidFunc(jsi::Runtime &rt) = 0; @@ -133,7 +133,7 @@ virtual void voidFunc(jsi::Runtime &rt) = 0; class JSI_EXPORT NativeSample2TurboModuleCxxSpecJSI : public TurboModule { protected: - NativeSample2TurboModuleCxxSpecJSI(std::shared_ptr jsInvoker); + NativeSample2TurboModuleCxxSpecJSI(std::shared_ptr jsInvoker); public: virtual jsi::Object getConstants(jsi::Runtime &rt) = 0; @@ -166,7 +166,7 @@ namespace react { class JSI_EXPORT NativeSampleTurboModuleCxxSpecJSI : public TurboModule { protected: - NativeSampleTurboModuleCxxSpecJSI(std::shared_ptr jsInvoker); + NativeSampleTurboModuleCxxSpecJSI(std::shared_ptr jsInvoker); public: virtual void voidFunc(jsi::Runtime &rt) = 0; @@ -175,7 +175,7 @@ virtual void voidFunc(jsi::Runtime &rt) = 0; class JSI_EXPORT NativeSample2TurboModuleCxxSpecJSI : public TurboModule { protected: - NativeSample2TurboModuleCxxSpecJSI(std::shared_ptr jsInvoker); + NativeSample2TurboModuleCxxSpecJSI(std::shared_ptr jsInvoker); public: virtual void voidFunc(jsi::Runtime &rt) = 0; diff --git a/packages/react-native-codegen/src/generators/modules/__tests__/__snapshots__/GenerateModuleHObjCpp-test.js.snap b/packages/react-native-codegen/src/generators/modules/__tests__/__snapshots__/GenerateModuleHObjCpp-test.js.snap index 40fe1754d61..577a0a1c386 100644 --- a/packages/react-native-codegen/src/generators/modules/__tests__/__snapshots__/GenerateModuleHObjCpp-test.js.snap +++ b/packages/react-native-codegen/src/generators/modules/__tests__/__snapshots__/GenerateModuleHObjCpp-test.js.snap @@ -158,7 +158,7 @@ namespace react { class JSI_EXPORT NativeSampleTurboModuleSpecJSI : public ObjCTurboModule { public: - NativeSampleTurboModuleSpecJSI(id instance, std::shared_ptr jsInvoker); + NativeSampleTurboModuleSpecJSI(id instance, std::shared_ptr jsInvoker); }; } // namespace react @@ -207,7 +207,7 @@ namespace react { class JSI_EXPORT NativeSampleTurboModuleSpecJSI : public ObjCTurboModule { public: - NativeSampleTurboModuleSpecJSI(id instance, std::shared_ptr jsInvoker); + NativeSampleTurboModuleSpecJSI(id instance, std::shared_ptr jsInvoker); }; } // namespace react @@ -313,7 +313,7 @@ namespace react { class JSI_EXPORT NativeSampleTurboModuleSpecJSI : public ObjCTurboModule { public: - NativeSampleTurboModuleSpecJSI(id instance, std::shared_ptr jsInvoker); + NativeSampleTurboModuleSpecJSI(id instance, std::shared_ptr jsInvoker); }; } // namespace react @@ -372,12 +372,12 @@ namespace react { class JSI_EXPORT NativeSampleTurboModuleSpecJSI : public ObjCTurboModule { public: - NativeSampleTurboModuleSpecJSI(id instance, std::shared_ptr jsInvoker); + NativeSampleTurboModuleSpecJSI(id instance, std::shared_ptr jsInvoker); }; class JSI_EXPORT NativeSample2TurboModuleSpecJSI : public ObjCTurboModule { public: - NativeSample2TurboModuleSpecJSI(id instance, std::shared_ptr jsInvoker); + NativeSample2TurboModuleSpecJSI(id instance, std::shared_ptr jsInvoker); }; } // namespace react @@ -435,12 +435,12 @@ namespace react { class JSI_EXPORT NativeSampleTurboModuleSpecJSI : public ObjCTurboModule { public: - NativeSampleTurboModuleSpecJSI(id instance, std::shared_ptr jsInvoker); + NativeSampleTurboModuleSpecJSI(id instance, std::shared_ptr jsInvoker); }; class JSI_EXPORT NativeSample2TurboModuleSpecJSI : public ObjCTurboModule { public: - NativeSample2TurboModuleSpecJSI(id instance, std::shared_ptr jsInvoker); + NativeSample2TurboModuleSpecJSI(id instance, std::shared_ptr jsInvoker); }; } // namespace react diff --git a/packages/react-native-codegen/src/generators/modules/__tests__/__snapshots__/GenerateModuleMm-test.js.snap b/packages/react-native-codegen/src/generators/modules/__tests__/__snapshots__/GenerateModuleMm-test.js.snap index 613f5aa0156..180b326378d 100644 --- a/packages/react-native-codegen/src/generators/modules/__tests__/__snapshots__/GenerateModuleMm-test.js.snap +++ b/packages/react-native-codegen/src/generators/modules/__tests__/__snapshots__/GenerateModuleMm-test.js.snap @@ -37,7 +37,7 @@ static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleSpecJSI_diffic .invokeObjCMethod(rt, ObjectKind, \\"difficult\\", @selector(difficult:), args, count); } -NativeSampleTurboModuleSpecJSI::NativeSampleTurboModuleSpecJSI(id instance, std::shared_ptr jsInvoker) +NativeSampleTurboModuleSpecJSI::NativeSampleTurboModuleSpecJSI(id instance, std::shared_ptr jsInvoker) : ObjCTurboModule(\\"SampleTurboModule\\", instance, jsInvoker) { methodMap_[\\"difficult\\"] = MethodMetadata {1, __hostFunction_NativeSampleTurboModuleSpecJSI_difficult}; setMethodArgConversionSelector(@\\"difficult\\", 0, @\\"JS_NativeSampleTurboModule_SpecDifficultA:\\"); @@ -67,7 +67,7 @@ namespace react { -NativeSampleTurboModuleSpecJSI::NativeSampleTurboModuleSpecJSI(id instance, std::shared_ptr jsInvoker) +NativeSampleTurboModuleSpecJSI::NativeSampleTurboModuleSpecJSI(id instance, std::shared_ptr jsInvoker) : ObjCTurboModule(\\"SampleTurboModule\\", instance, jsInvoker) { } @@ -135,7 +135,7 @@ static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleSpecJSI_getVal .invokeObjCMethod(rt, PromiseKind, \\"getValueWithPromise\\", @selector(getValueWithPromise:resolve:reject:), args, count); } -NativeSampleTurboModuleSpecJSI::NativeSampleTurboModuleSpecJSI(id instance, std::shared_ptr jsInvoker) +NativeSampleTurboModuleSpecJSI::NativeSampleTurboModuleSpecJSI(id instance, std::shared_ptr jsInvoker) : ObjCTurboModule(\\"SampleTurboModule\\", instance, jsInvoker) { methodMap_[\\"getConstants\\"] = MethodMetadata {0, __hostFunction_NativeSampleTurboModuleSpecJSI_getConstants}; methodMap_[\\"voidFunc\\"] = MethodMetadata {0, __hostFunction_NativeSampleTurboModuleSpecJSI_voidFunc}; @@ -177,7 +177,7 @@ static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleSpecJSI_voidFu .invokeObjCMethod(rt, VoidKind, \\"voidFunc\\", @selector(voidFunc), args, count); } -NativeSampleTurboModuleSpecJSI::NativeSampleTurboModuleSpecJSI(id instance, std::shared_ptr jsInvoker) +NativeSampleTurboModuleSpecJSI::NativeSampleTurboModuleSpecJSI(id instance, std::shared_ptr jsInvoker) : ObjCTurboModule(\\"SampleTurboModule\\", instance, jsInvoker) { methodMap_[\\"voidFunc\\"] = MethodMetadata {0, __hostFunction_NativeSampleTurboModuleSpecJSI_voidFunc}; } @@ -187,7 +187,7 @@ static facebook::jsi::Value __hostFunction_NativeSample2TurboModuleSpecJSI_voidF .invokeObjCMethod(rt, VoidKind, \\"voidFunc\\", @selector(voidFunc), args, count); } -NativeSample2TurboModuleSpecJSI::NativeSample2TurboModuleSpecJSI(id instance, std::shared_ptr jsInvoker) +NativeSample2TurboModuleSpecJSI::NativeSample2TurboModuleSpecJSI(id instance, std::shared_ptr jsInvoker) : ObjCTurboModule(\\"Sample2TurboModule\\", instance, jsInvoker) { methodMap_[\\"voidFunc\\"] = MethodMetadata {0, __hostFunction_NativeSample2TurboModuleSpecJSI_voidFunc}; @@ -221,7 +221,7 @@ static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleSpecJSI_voidFu .invokeObjCMethod(rt, VoidKind, \\"voidFunc\\", @selector(voidFunc), args, count); } -NativeSampleTurboModuleSpecJSI::NativeSampleTurboModuleSpecJSI(id instance, std::shared_ptr jsInvoker) +NativeSampleTurboModuleSpecJSI::NativeSampleTurboModuleSpecJSI(id instance, std::shared_ptr jsInvoker) : ObjCTurboModule(\\"SampleTurboModule\\", instance, jsInvoker) { methodMap_[\\"voidFunc\\"] = MethodMetadata {0, __hostFunction_NativeSampleTurboModuleSpecJSI_voidFunc}; } @@ -230,7 +230,7 @@ static facebook::jsi::Value __hostFunction_NativeSample2TurboModuleSpecJSI_voidF .invokeObjCMethod(rt, VoidKind, \\"voidFunc\\", @selector(voidFunc), args, count); } -NativeSample2TurboModuleSpecJSI::NativeSample2TurboModuleSpecJSI(id instance, std::shared_ptr jsInvoker) +NativeSample2TurboModuleSpecJSI::NativeSample2TurboModuleSpecJSI(id instance, std::shared_ptr jsInvoker) : ObjCTurboModule(\\"Sample2TurboModule\\", instance, jsInvoker) { methodMap_[\\"voidFunc\\"] = MethodMetadata {0, __hostFunction_NativeSample2TurboModuleSpecJSI_voidFunc}; } diff --git a/scripts/autolink-ios.rb b/scripts/autolink-ios.rb index b776bc78967..b8aebcfcbdf 100644 --- a/scripts/autolink-ios.rb +++ b/scripts/autolink-ios.rb @@ -36,7 +36,7 @@ def use_react_native! (options={}) pod 'React-jsi', :path => "#{prefix}/ReactCommon/jsi" pod 'React-jsiexecutor', :path => "#{prefix}/ReactCommon/jsiexecutor" pod 'React-jsinspector', :path => "#{prefix}/ReactCommon/jsinspector" - pod 'ReactCommon/jscallinvoker', :path => "#{prefix}/ReactCommon" + pod 'ReactCommon/callinvoker', :path => "#{prefix}/ReactCommon" pod 'ReactCommon/turbomodule/core', :path => "#{prefix}/ReactCommon" pod 'Yoga', :path => "#{prefix}/ReactCommon/yoga" diff --git a/template/ios/Podfile b/template/ios/Podfile index fd8b1aa03ac..a05c06b0c91 100644 --- a/template/ios/Podfile +++ b/template/ios/Podfile @@ -62,7 +62,7 @@ target 'HelloWorld' do pod 'React-jsi', :path => '../node_modules/react-native/ReactCommon/jsi' pod 'React-jsiexecutor', :path => '../node_modules/react-native/ReactCommon/jsiexecutor' pod 'React-jsinspector', :path => '../node_modules/react-native/ReactCommon/jsinspector' - pod 'ReactCommon/jscallinvoker', :path => "../node_modules/react-native/ReactCommon" + pod 'ReactCommon/callinvoker', :path => "../node_modules/react-native/ReactCommon" pod 'ReactCommon/turbomodule/core', :path => "../node_modules/react-native/ReactCommon" pod 'Yoga', :path => '../node_modules/react-native/ReactCommon/yoga'