From c1dc4d3c09a763a975473bc35ce0323da9659d22 Mon Sep 17 00:00:00 2001
From: Daiki Ihara <sasurau4@gmail.com>
Date: Fri, 17 May 2019 01:28:23 +0900
Subject: [PATCH 1/8] [TM] Add spec for AlertManager

---
 Libraries/Alert/NativeAlertManager.js  | 43 ++++++++++++++++++++++++++
 Libraries/Alert/RCTAlertManager.ios.js |  2 +-
 2 files changed, 44 insertions(+), 1 deletion(-)
 create mode 100644 Libraries/Alert/NativeAlertManager.js

diff --git a/Libraries/Alert/NativeAlertManager.js b/Libraries/Alert/NativeAlertManager.js
new file mode 100644
index 000000000000..6adf18616bbf
--- /dev/null
+++ b/Libraries/Alert/NativeAlertManager.js
@@ -0,0 +1,43 @@
+/**
+ * Copyright 2004-present Facebook. All Rights Reserved.
+ *
+ * @flow strict-local
+ * @format
+ */
+
+'use strict';
+
+import type {TurboModule} from 'RCTExport';
+import * as TurboModuleRegistry from 'TurboModuleRegistry';
+
+type Button = {|
+  text: string,
+  onPress: () => void,
+  style: 'default' | 'cancel' | 'destructive'
+|};
+
+type AlertType = $Enum<{
+  default: string,
+  'plain-text': string,
+  'secure-text': string,
+  'login-password': string,
+}>;
+
+type Args = {|
+  title: string,
+  message?: string,
+  buttons: Array<Button>,
+  type?: AlertType,
+  defaultValue?: string,
+  cancelButtonKey?: string, 
+  destructiveButtonKey?: string,
+  keyboardType?: string,
+|}
+
+export interface Spec extends TurboModule {
+  +alertWithArgs: (args: Args, callback: () => void) => void;
+};
+
+export default TurboModuleRegistry.getEnforcing<Spec>(
+  'AlertManager'
+);
diff --git a/Libraries/Alert/RCTAlertManager.ios.js b/Libraries/Alert/RCTAlertManager.ios.js
index 246967358982..bc5a8e350d17 100644
--- a/Libraries/Alert/RCTAlertManager.ios.js
+++ b/Libraries/Alert/RCTAlertManager.ios.js
@@ -10,6 +10,6 @@
 
 'use strict';
 
-const RCTAlertManager = require('../BatchedBridge/NativeModules').AlertManager;
+const RCTAlertManager = require('./NativeAlertManager');
 
 module.exports = RCTAlertManager;

From 360a8ec0a4ef8b1f80cf9785166bf40406791837 Mon Sep 17 00:00:00 2001
From: Daiki Ihara <sasurau4@gmail.com>
Date: Fri, 17 May 2019 17:43:42 +0900
Subject: [PATCH 2/8] fix lint

---
 Libraries/Alert/NativeAlertManager.js | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/Libraries/Alert/NativeAlertManager.js b/Libraries/Alert/NativeAlertManager.js
index 6adf18616bbf..37a8fb843bf1 100644
--- a/Libraries/Alert/NativeAlertManager.js
+++ b/Libraries/Alert/NativeAlertManager.js
@@ -13,7 +13,7 @@ import * as TurboModuleRegistry from 'TurboModuleRegistry';
 type Button = {|
   text: string,
   onPress: () => void,
-  style: 'default' | 'cancel' | 'destructive'
+  style: 'default' | 'cancel' | 'destructive',
 |};
 
 type AlertType = $Enum<{
@@ -29,15 +29,13 @@ type Args = {|
   buttons: Array<Button>,
   type?: AlertType,
   defaultValue?: string,
-  cancelButtonKey?: string, 
+  cancelButtonKey?: string,
   destructiveButtonKey?: string,
   keyboardType?: string,
-|}
+|};
 
 export interface Spec extends TurboModule {
   +alertWithArgs: (args: Args, callback: () => void) => void;
-};
+}
 
-export default TurboModuleRegistry.getEnforcing<Spec>(
-  'AlertManager'
-);
+export default TurboModuleRegistry.getEnforcing<Spec>('AlertManager');

From 01dfd43e31ca3acfa7014271837ec2597076afb5 Mon Sep 17 00:00:00 2001
From: Daiki Ihara <sasurau4@gmail.com>
Date: Sat, 18 May 2019 13:09:07 +0900
Subject: [PATCH 3/8] use string instead of union and enums for spec of
 AlertManager

---
 Libraries/Alert/NativeAlertManager.js | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/Libraries/Alert/NativeAlertManager.js b/Libraries/Alert/NativeAlertManager.js
index 37a8fb843bf1..8de6a7f0949a 100644
--- a/Libraries/Alert/NativeAlertManager.js
+++ b/Libraries/Alert/NativeAlertManager.js
@@ -13,21 +13,14 @@ import * as TurboModuleRegistry from 'TurboModuleRegistry';
 type Button = {|
   text: string,
   onPress: () => void,
-  style: 'default' | 'cancel' | 'destructive',
+  style: string,
 |};
 
-type AlertType = $Enum<{
-  default: string,
-  'plain-text': string,
-  'secure-text': string,
-  'login-password': string,
-}>;
-
 type Args = {|
   title: string,
   message?: string,
   buttons: Array<Button>,
-  type?: AlertType,
+  type?: string,
   defaultValue?: string,
   cancelButtonKey?: string,
   destructiveButtonKey?: string,

From b6dca5b5ba244c0ae27e725678101a867fa96a80 Mon Sep 17 00:00:00 2001
From: Daiki Ihara <sasurau4@gmail.com>
Date: Thu, 23 May 2019 19:36:46 +0900
Subject: [PATCH 4/8] use es module instead of commonjs in Alert

---
 Libraries/Alert/Alert.js               | 3 +--
 Libraries/Alert/RCTAlertManager.ios.js | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/Libraries/Alert/Alert.js b/Libraries/Alert/Alert.js
index 1e03d1d136df..94c90343755f 100644
--- a/Libraries/Alert/Alert.js
+++ b/Libraries/Alert/Alert.js
@@ -15,8 +15,7 @@ import Platform from '../Utilities/Platform';
 import DialogManagerAndroid, {
   type DialogOptions,
 } from '../NativeModules/specs/NativeDialogManagerAndroid';
-
-const RCTAlertManager = NativeModules.AlertManager;
+import RCTAlertManager from './RCTAlertManager';
 
 export type Buttons = Array<{
   text?: string,
diff --git a/Libraries/Alert/RCTAlertManager.ios.js b/Libraries/Alert/RCTAlertManager.ios.js
index bc5a8e350d17..53bda2a59847 100644
--- a/Libraries/Alert/RCTAlertManager.ios.js
+++ b/Libraries/Alert/RCTAlertManager.ios.js
@@ -10,6 +10,6 @@
 
 'use strict';
 
-const RCTAlertManager = require('./NativeAlertManager');
+import RCTAlertManager from './NativeAlertManager';
 
 module.exports = RCTAlertManager;

From 2b5b22f02fc5df253ea63c99d02c0adde028956a Mon Sep 17 00:00:00 2001
From: Daiki Ihara <sasurau4@gmail.com>
Date: Thu, 23 May 2019 20:00:24 +0900
Subject: [PATCH 5/8] replace call-sites inside ALert.js

---
 Libraries/Alert/Alert.js              |  8 +++++++-
 Libraries/Alert/NativeAlertManager.js | 13 ++++++++-----
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/Libraries/Alert/Alert.js b/Libraries/Alert/Alert.js
index 94c90343755f..9c3f1183282c 100644
--- 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
index 8de6a7f0949a..4c72d946826c 100644
--- 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');

From 7091b2ecb3ebfb6c72082a1b98cb1cf204ec0fa0 Mon Sep 17 00:00:00 2001
From: Daiki Ihara <sasurau4@gmail.com>
Date: Thu, 23 May 2019 21:23:38 +0900
Subject: [PATCH 6/8] fix pointed out

---
 Libraries/Alert/Alert.js              | 15 ++++-----------
 Libraries/Alert/NativeAlertManager.js | 14 ++++++--------
 2 files changed, 10 insertions(+), 19 deletions(-)

diff --git a/Libraries/Alert/Alert.js b/Libraries/Alert/Alert.js
index 9c3f1183282c..16a5b5b29e91 100644
--- a/Libraries/Alert/Alert.js
+++ b/Libraries/Alert/Alert.js
@@ -28,18 +28,11 @@ type Options = {
   onDismiss?: ?Function,
 };
 
-type AlertType = $Keys<{
-  default: string,
-  'plain-text': string,
-  'secure-text': string,
-  'login-password': string,
-}>;
+/* 'default' | plain-text' | 'secure-text' | 'login-password' */
+type AlertType = string;
 
-export type AlertButtonStyle = $Keys<{
-  default: string,
-  cancel: string,
-  destructive: string,
-}>;
+/* 'default' | 'cancel' | 'destructive' */
+export type AlertButtonStyle = string;
 
 /**
  * Launches an alert dialog with the specified title and message.
diff --git a/Libraries/Alert/NativeAlertManager.js b/Libraries/Alert/NativeAlertManager.js
index 4c72d946826c..6c47d0bc97e7 100644
--- a/Libraries/Alert/NativeAlertManager.js
+++ b/Libraries/Alert/NativeAlertManager.js
@@ -9,17 +9,13 @@
 
 import type {TurboModule} from 'RCTExport';
 import * as TurboModuleRegistry from 'TurboModuleRegistry';
-
-type Button = {|
-  text?: string,
-  onPress?: () => void,
-  style?: string,
-|};
+import Platform from '../Utilities/Platform';
+import {type Buttons} from './Alert';
 
 type Args = {|
   title: string,
   message?: string,
-  buttons?: Array<Button>,
+  buttons?: Buttons,
   type?: string,
   defaultValue?: string,
   cancelButtonKey?: string,
@@ -34,4 +30,6 @@ export interface Spec extends TurboModule {
   ) => void;
 }
 
-export default TurboModuleRegistry.getEnforcing<Spec>('AlertManager');
+export default (Platform.OS === 'ios'
+  ? TurboModuleRegistry.getEnforcing<Spec>('AlertManager')
+  : undefined);

From fa8beb37eb4377f37b9e516db8c869a9f3bbc1b7 Mon Sep 17 00:00:00 2001
From: Daiki Ihara <sasurau4@gmail.com>
Date: Fri, 24 May 2019 22:19:35 +0900
Subject: [PATCH 7/8] move types to NativeAlertManager

---
 Libraries/Alert/Alert.js              | 24 +++++++-----------------
 Libraries/Alert/NativeAlertManager.js | 18 +++++++++++++++++-
 2 files changed, 24 insertions(+), 18 deletions(-)

diff --git a/Libraries/Alert/Alert.js b/Libraries/Alert/Alert.js
index 16a5b5b29e91..2030fa4962c3 100644
--- a/Libraries/Alert/Alert.js
+++ b/Libraries/Alert/Alert.js
@@ -16,23 +16,12 @@ import DialogManagerAndroid, {
   type DialogOptions,
 } from '../NativeModules/specs/NativeDialogManagerAndroid';
 import RCTAlertManager from './RCTAlertManager';
-
-export type Buttons = Array<{
-  text?: string,
-  onPress?: ?Function,
-  style?: AlertButtonStyle,
-}>;
-
-type Options = {
-  cancelable?: ?boolean,
-  onDismiss?: ?Function,
-};
-
-/* 'default' | plain-text' | 'secure-text' | 'login-password' */
-type AlertType = string;
-
-/* 'default' | 'cancel' | 'destructive' */
-export type AlertButtonStyle = string;
+import {
+  type Buttons,
+  type Options,
+  type AlertType,
+  type AlertButtonStyle,
+} from './NativeAlertManager';
 
 /**
  * Launches an alert dialog with the specified title and message.
@@ -172,6 +161,7 @@ class Alert {
         },
         (id, value) => {
           const cb = callbacks[id];
+          // $FlowFixMe
           cb && cb(value);
         },
       );
diff --git a/Libraries/Alert/NativeAlertManager.js b/Libraries/Alert/NativeAlertManager.js
index 6c47d0bc97e7..dc22fe5412de 100644
--- a/Libraries/Alert/NativeAlertManager.js
+++ b/Libraries/Alert/NativeAlertManager.js
@@ -10,7 +10,23 @@
 import type {TurboModule} from 'RCTExport';
 import * as TurboModuleRegistry from 'TurboModuleRegistry';
 import Platform from '../Utilities/Platform';
-import {type Buttons} from './Alert';
+
+export type Buttons = Array<{
+  text?: string,
+  onPress?: ?() => void,
+  style?: AlertButtonStyle,
+}>;
+
+export type Options = {
+  cancelable?: ?boolean,
+  onDismiss?: ?() => void,
+};
+
+/* 'default' | plain-text' | 'secure-text' | 'login-password' */
+export type AlertType = string;
+
+/* 'default' | 'cancel' | 'destructive' */
+export type AlertButtonStyle = string;
 
 type Args = {|
   title: string,

From b80f17dea474d97a647096b2cd2a00410da0ed97 Mon Sep 17 00:00:00 2001
From: Daiki Ihara <sasurau4@gmail.com>
Date: Sat, 25 May 2019 00:04:32 +0900
Subject: [PATCH 8/8] fix lint

---
 Libraries/Alert/Alert.js | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/Libraries/Alert/Alert.js b/Libraries/Alert/Alert.js
index 2030fa4962c3..3eef5b2c1556 100644
--- a/Libraries/Alert/Alert.js
+++ b/Libraries/Alert/Alert.js
@@ -16,12 +16,7 @@ import DialogManagerAndroid, {
   type DialogOptions,
 } from '../NativeModules/specs/NativeDialogManagerAndroid';
 import RCTAlertManager from './RCTAlertManager';
-import {
-  type Buttons,
-  type Options,
-  type AlertType,
-  type AlertButtonStyle,
-} from './NativeAlertManager';
+import {type Buttons, type Options, type AlertType} from './NativeAlertManager';
 
 /**
  * Launches an alert dialog with the specified title and message.