Make RCTAppState TurboModule-compatible

Summary: See title. Changelog: [iOS][Added] - Make RCTAppState TurboModule-compatible Reviewed By: PeteTheHeat Differential Revision: D18142253 fbshipit-source-id: 5bd8afa6e3ee98f92aac3b2ebdfe63b9f7afc775
facebook · Nov 1, 2019 · 7233ae4 · 7233ae4
1 parent 6481a12
commit 7233ae4
Show file tree

Hide file tree

Showing 9 changed files with 34 additions and 12 deletions.
diff --git a/Libraries/AppState/NativeAppState.js b/Libraries/AppState/NativeAppState.js
@@ -19,7 +19,7 @@ export interface Spec extends TurboModule {
   |};
   +getCurrentAppState: (
     success: (appState: {|app_state: string|}) => void,
-    failure: (error: Object) => void,
+    error: (error: Object) => void,
   ) => void;
 
   // Events

diff --git a/Libraries/FBReactNativeSpec/FBReactNativeSpec/FBReactNativeSpec-generated.mm b/Libraries/FBReactNativeSpec/FBReactNativeSpec/FBReactNativeSpec-generated.mm
@@ -403,7 +403,7 @@ + (RCTManagedPointer *)JS_NativeAppState_SpecGetCurrentAppStateSuccessAppState:(
 
 
     static facebook::jsi::Value __hostFunction_NativeAppStateSpecJSI_getCurrentAppState(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
-      return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, VoidKind, "getCurrentAppState", @selector(getCurrentAppState:failure:), args, count);
+      return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, VoidKind, "getCurrentAppState", @selector(getCurrentAppState:error:), args, count);
     }
 
     static facebook::jsi::Value __hostFunction_NativeAppStateSpecJSI_addListener(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {

diff --git a/Libraries/FBReactNativeSpec/FBReactNativeSpec/FBReactNativeSpec.h b/Libraries/FBReactNativeSpec/FBReactNativeSpec/FBReactNativeSpec.h
@@ -380,7 +380,7 @@ namespace JS {
 @protocol NativeAppStateSpec <RCTBridgeModule, RCTTurboModule>
 
 - (void)getCurrentAppState:(RCTResponseSenderBlock)success
-                   failure:(RCTResponseSenderBlock)failure;
+                     error:(RCTResponseSenderBlock)error;
 - (void)addListener:(NSString *)eventName;
 - (void)removeListeners:(double)count;
 - (facebook::react::ModuleConstants<JS::NativeAppState::Constants::Builder>)constantsToExport;

diff --git a/React/CoreModules/BUCK b/React/CoreModules/BUCK
@@ -81,6 +81,9 @@ rn_apple_library(
         ) + react_module_plugin_providers(
             name = "KeyboardObserver",
             native_class_func = "RCTKeyboardObserverCls",
+        ) + react_module_plugin_providers(
+            name = "AppState",
+            native_class_func = "RCTAppStateCls",
         ),
     plugins_header = "FBCoreModulesPlugins.h",
     preprocessor_flags = OBJC_ARC_PREPROCESSOR_FLAGS + get_debug_preprocessor_flags() + rn_extra_build_flags() + [

diff --git a/React/CoreModules/CoreModulesPlugins.h b/React/CoreModules/CoreModulesPlugins.h
@@ -43,6 +43,7 @@ Class RCTAsyncLocalStorageCls(void) __attribute__((used));
 Class RCTTimingCls(void) __attribute__((used));
 Class RCTStatusBarManagerCls(void) __attribute__((used));
 Class RCTKeyboardObserverCls(void) __attribute__((used));
+Class RCTAppStateCls(void) __attribute__((used));
 
 #ifdef __cplusplus
 }

diff --git a/React/CoreModules/CoreModulesPlugins.mm b/React/CoreModules/CoreModulesPlugins.mm
@@ -32,6 +32,7 @@ Class RCTCoreModulesClassProvider(const char *name) {
     {"Timing", RCTTimingCls},
     {"StatusBarManager", RCTStatusBarManagerCls},
     {"KeyboardObserver", RCTKeyboardObserverCls},
+    {"AppState", RCTAppStateCls},
   };
 
   auto p = sCoreModuleClassMap.find(name);

diff --git a/React/Modules/RCTAppState.h → React/CoreModules/RCTAppState.h b/React/Modules/RCTAppState.h → React/CoreModules/RCTAppState.h
diff --git a/React/Modules/RCTAppState.m → React/CoreModules/RCTAppState.mm b/React/Modules/RCTAppState.m → React/CoreModules/RCTAppState.mm
@@ -7,10 +7,13 @@
 
 #import "RCTAppState.h"
 
-#import "RCTAssert.h"
-#import "RCTBridge.h"
-#import "RCTEventDispatcher.h"
-#import "RCTUtils.h"
+#import <FBReactNativeSpec/FBReactNativeSpec.h>
+#import <React/RCTAssert.h>
+#import <React/RCTBridge.h>
+#import <React/RCTEventDispatcher.h>
+#import <React/RCTUtils.h>
+
+#import "CoreModulesPlugins.h"
 
 static NSString *RCTCurrentAppState()
 {
@@ -30,6 +33,9 @@
   return states[@(RCTSharedApplication().applicationState)] ?: @"unknown";
 }
 
+@interface RCTAppState() <NativeAppStateSpec>
+@end
+
 @implementation RCTAppState
 {
   NSString *_lastKnownState;
@@ -47,14 +53,16 @@ - (dispatch_queue_t)methodQueue
   return dispatch_get_main_queue();
 }
 
-- (NSDictionary *)constantsToExport
+- (facebook::react::ModuleConstants<JS::NativeAppState::Constants>)constantsToExport
 {
-  return [self getConstants];
+  return (facebook::react::ModuleConstants<JS::NativeAppState::Constants>)[self getConstants];
 }
 
-- (NSDictionary *)getConstants
+- (facebook::react::ModuleConstants<JS::NativeAppState::Constants>)getConstants
 {
-  return @{@"initialAppState": RCTCurrentAppState()};
+  return facebook::react::typedConstants<JS::NativeAppState::Constants>({
+    .initialAppState = RCTCurrentAppState(),
+  });
 }
 
 #pragma mark - Lifecycle
@@ -126,4 +134,13 @@ - (void)handleAppStateDidChange:(NSNotification *)notification
   callback(@[@{@"app_state": RCTCurrentAppState()}]);
 }
 
+- (std::shared_ptr<facebook::react::TurboModule>)getTurboModuleWithJsInvoker:(std::shared_ptr<facebook::react::CallInvoker>)jsInvoker
+{
+  return std::make_shared<facebook::react::NativeAppStateSpecJSI>(self, jsInvoker);
+}
+
 @end
+
+Class RCTAppStateCls(void) {
+  return RCTAppState.class;
+}
diff --git a/ReactAndroid/src/main/java/com/facebook/fbreact/specs/NativeAppStateSpec.java b/ReactAndroid/src/main/java/com/facebook/fbreact/specs/NativeAppStateSpec.java
@@ -34,7 +34,7 @@ public NativeAppStateSpec(ReactApplicationContext reactContext) {
   public abstract void removeListeners(double count);
 
   @ReactMethod
-  public abstract void getCurrentAppState(Callback success, Callback failure);
+  public abstract void getCurrentAppState(Callback success, Callback error);
 
   @ReactMethod
   public abstract void addListener(String eventName);