Revert D16969764: Make RCTDevLoadingView TurboModule-compatible

Differential Revision:
D16969764

Original commit changeset: 47e6682eea3f

fbshipit-source-id: d95b76eb8e57bbaff840b3d85f3745b13d622ce0

Author: RSNara

Libraries/FBReactNativeSpec/FBReactNativeSpec/FBReactNativeSpec.h

@@ -848,8 +848,8 @@ namespace facebook {
 @protocol NativeDevLoadingViewSpec <RCTBridgeModule, RCTTurboModule>
 
 - (void)showMessage:(NSString *)message
-              color:(NSNumber *)color
-    backgroundColor:(NSNumber *)backgroundColor;
+              color:(NSDictionary *)color
+    backgroundColor:(NSDictionary *)backgroundColor;
 - (void)hide;
 
 @end

Libraries/Utilities/NativeDevLoadingView.js

@@ -16,8 +16,8 @@ import * as TurboModuleRegistry from '../TurboModule/TurboModuleRegistry';
 export interface Spec extends TurboModule {
   +showMessage: (
     message: string,
-    color: ?number,
-    backgroundColor: ?number,
+    color: Object,
+    backgroundColor: Object,
   ) => void;
   +hide: () => void;
 }

React/CoreModules/BUCK

@@ -105,9 +105,6 @@ rn_apple_library(
         ) + react_module_plugin_providers(
             name = "WebSocketModule",
             native_class_func = "RCTWebSocketModuleCls",
-        ) + react_module_plugin_providers(
-            name = "DevLoadingView",
-            native_class_func = "RCTDevLoadingViewCls",
         ),
     plugins_header = "FBCoreModulesPlugins.h",
     preprocessor_flags = OBJC_ARC_PREPROCESSOR_FLAGS + get_debug_preprocessor_flags() + rn_extra_build_flags() + [

React/CoreModules/CoreModulesPlugins.h

@@ -51,7 +51,6 @@ Class RCTRedBoxCls(void) __attribute__((used));
 Class RCTTVNavigationEventEmitterCls(void) __attribute__((used));
 Class RCTWebSocketExecutorCls(void) __attribute__((used));
 Class RCTWebSocketModuleCls(void) __attribute__((used));
-Class RCTDevLoadingViewCls(void) __attribute__((used));
 
 #ifdef __cplusplus
 }

React/CoreModules/CoreModulesPlugins.mm

@@ -40,7 +40,6 @@ Class RCTCoreModulesClassProvider(const char *name) {
     {"TVNavigationEventEmitter", RCTTVNavigationEventEmitterCls},
     {"WebSocketExecutor", RCTWebSocketExecutorCls},
     {"WebSocketModule", RCTWebSocketModuleCls},
-    {"DevLoadingView", RCTDevLoadingViewCls},
   };
 
   auto p = sCoreModuleClassMap.find(name);

React/CoreModules/RCTDevLoadingView.h React/DevSupport/RCTDevLoadingView.hReact/CoreModules/RCTDevLoadingView.h renamed to React/DevSupport/RCTDevLoadingView.h

@@ -6,10 +6,17 @@
  */
 
 #import <UIKit/UIKit.h>
+
 #import <React/RCTBridgeModule.h>
 
 @class RCTLoadingProgress;
 
 @interface RCTDevLoadingView : NSObject <RCTBridgeModule>
+
++ (void)setEnabled:(BOOL)enabled;
+- (void)showMessage:(NSString *)message color:(UIColor *)color backgroundColor:(UIColor *)backgroundColor;
+- (void)showWithURL:(NSURL *)URL;
 - (void)updateProgress:(RCTLoadingProgress *)progress;
+- (void)hide;
+
 @end

React/CoreModules/RCTDevLoadingView.mm React/DevSupport/RCTDevLoadingView.mReact/CoreModules/RCTDevLoadingView.mm renamed to React/DevSupport/RCTDevLoadingView.m

@@ -10,22 +10,14 @@
 #import <QuartzCore/QuartzCore.h>
 
 #import <React/RCTBridge.h>
-#import <React/RCTConvert.h>
 #import <React/RCTDefines.h>
-#import <React/RCTDevLoadingViewSetEnabled.h>
 #import <React/RCTModalHostViewController.h>
 #import <React/RCTUtils.h>
-#import <FBReactNativeSpec/FBReactNativeSpec.h>
-
-#import "CoreModulesPlugins.h"
-
-using namespace facebook::react;
-
-@interface RCTDevLoadingView () <NativeDevLoadingViewSpec>
-@end
 
 #if RCT_DEV | RCT_ENABLE_LOADING_VIEW
 
+static BOOL isEnabled = YES;
+
 @implementation RCTDevLoadingView
 {
   UIWindow *_window;
@@ -37,6 +29,11 @@ @implementation RCTDevLoadingView
 
 RCT_EXPORT_MODULE()
 
++ (void)setEnabled:(BOOL)enabled
+{
+  isEnabled = enabled;
+}
+
 + (BOOL)requiresMainQueueSetup
 {
   return YES;
@@ -60,14 +57,9 @@ - (void)setBridge:(RCTBridge *)bridge
   }
 }
 
-RCT_EXPORT_METHOD(showMessage:(NSString *)message color:(NSNumber *)color backgroundColor:(NSNumber *)backgroundColor)
-{
-  [self showMessage:message withColor:[RCTConvert UIColor:color] andBackgroundColor:[RCTConvert UIColor:backgroundColor]];
-}
-
--(void)showMessage:(NSString *)message withColor:(UIColor *)color andBackgroundColor:(UIColor *)backgroundColor
+RCT_EXPORT_METHOD(showMessage:(NSString *)message color:(UIColor *)color backgroundColor:(UIColor *)backgroundColor)
 {
-  if (!RCTDevLoadingViewGetEnabled()) {
+  if (!isEnabled) {
     return;
   }
 
@@ -107,7 +99,7 @@ -(void)showMessage:(NSString *)message withColor:(UIColor *)color andBackgroundC
 
 RCT_EXPORT_METHOD(hide)
 {
-  if (!RCTDevLoadingViewGetEnabled()) {
+  if (!isEnabled) {
     return;
   }
 
@@ -149,8 +141,8 @@ - (void)showWithURL:(NSURL *)URL
   }
 
   [self showMessage:message
-          withColor:color
- andBackgroundColor:backgroundColor];
+              color:color
+    backgroundColor:backgroundColor];
 }
 
 - (void)updateProgress:(RCTLoadingProgress *)progress
@@ -163,31 +155,19 @@ - (void)updateProgress:(RCTLoadingProgress *)progress
   });
 }
 
-- (std::shared_ptr<TurboModule>)getTurboModuleWithJsInvoker:(std::shared_ptr<CallInvoker>)jsInvoker
-{
-  return std::make_shared<NativeDevLoadingViewSpecJSI>(self, jsInvoker);
-}
-
 @end
 
 #else
 
 @implementation RCTDevLoadingView
 
 + (NSString *)moduleName { return nil; }
-- (void)showMessage:(NSString *)message color:(NSNumber *)color backgroundColor:(NSNumber *)backgroundColor { }
++ (void)setEnabled:(BOOL)enabled { }
+- (void)showMessage:(NSString *)message color:(UIColor *)color backgroundColor:(UIColor *)backgroundColor { }
 - (void)showWithURL:(NSURL *)URL { }
 - (void)updateProgress:(RCTLoadingProgress *)progress { }
 - (void)hide { }
-- (std::shared_ptr<TurboModule>)getTurboModuleWithJsInvoker:(std::shared_ptr<CallInvoker>)jsInvoker
-{
-  return std::make_shared<NativeDevLoadingViewSpecJSI>(self, jsInvoker);
-}
 
 @end
 
 #endif
-
-Class RCTDevLoadingViewCls(void) {
-  return RCTDevLoadingView.class;
-}

React/DevSupport/RCTDevLoadingViewSetEnabled.h

@@ -16,6 +16,7 @@
 import com.facebook.react.bridge.ReactContextBaseJavaModule;
 import com.facebook.react.bridge.ReactMethod;
 import com.facebook.react.bridge.ReactModuleWithSpec;
+import com.facebook.react.bridge.ReadableMap;
 import com.facebook.react.turbomodule.core.interfaces.TurboModule;
 
 public abstract class NativeDevLoadingViewSpec extends ReactContextBaseJavaModule implements ReactModuleWithSpec, TurboModule {
@@ -27,5 +28,5 @@ public NativeDevLoadingViewSpec(ReactApplicationContext reactContext) {
   public abstract void hide();
 
   @ReactMethod
-  public abstract void showMessage(String message, Double color, Double backgroundColor);
+  public abstract void showMessage(String message, ReadableMap color, ReadableMap backgroundColor);
 }