replace call-sites inside ALert.js

facebook · May 23, 2019 · 2b5b22f · 2b5b22f
1 parent b6dca5b
commit 2b5b22f
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 6 deletions.
diff --git a/Libraries/Alert/Alert.js b/Libraries/Alert/Alert.js
@@ -125,11 +125,14 @@ class Alert {
         );
 
         const callback = type;
+        if (!RCTAlertManager) {
+          return;
+        }
         RCTAlertManager.alertWithArgs(
           {
             title: title || '',
             type: 'plain-text',
-            defaultValue: message,
+            defaultValue: message || '',
           },
           (id, value) => {
             callback(value);
@@ -160,6 +163,9 @@ class Alert {
         });
       }
 
+      if (!RCTAlertManager) {
+        return;
+      }
       RCTAlertManager.alertWithArgs(
         {
           title: title || '',

diff --git a/Libraries/Alert/NativeAlertManager.js b/Libraries/Alert/NativeAlertManager.js
@@ -11,15 +11,15 @@ import type {TurboModule} from 'RCTExport';
 import * as TurboModuleRegistry from 'TurboModuleRegistry';
 
 type Button = {|
-  text: string,
-  onPress: () => void,
-  style: string,
+  text?: string,
+  onPress?: () => void,
+  style?: string,
 |};
 
 type Args = {|
   title: string,
   message?: string,
-  buttons: Array<Button>,
+  buttons?: Array<Button>,
   type?: string,
   defaultValue?: string,
   cancelButtonKey?: string,
@@ -28,7 +28,10 @@ type Args = {|
 |};
 
 export interface Spec extends TurboModule {
-  +alertWithArgs: (args: Args, callback: () => void) => void;
+  +alertWithArgs: (
+    args: Args,
+    callback: (id: number, value: string) => void,
+  ) => void;
 }
 
 export default TurboModuleRegistry.getEnforcing<Spec>('AlertManager');