react-native-windows 0.0.0-canary.95 → 0.0.0-canary.950

package/Libraries/Alert/Alert.js

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) Facebook, Inc. and its affiliates.
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -8,12 +8,9 @@
  * @flow
  */
 
-'use strict';
+import type {DialogOptions} from '../NativeModules/specs/NativeDialogManagerAndroid';
 
 import Platform from '../Utilities/Platform';
-import NativeDialogManagerAndroid, {
-  type DialogOptions,
-} from '../NativeModules/specs/NativeDialogManagerAndroid';
 import RCTAlertManager from './RCTAlertManager';
 
 export type AlertType =
@@ -25,12 +22,14 @@ export type AlertButtonStyle = 'default' | 'cancel' | 'destructive';
 export type Buttons = Array<{
   text?: string,
   onPress?: ?Function,
+  isPreferred?: boolean,
   style?: AlertButtonStyle,
   ...
 }>;
 
 type Options = {
   cancelable?: ?boolean,
+  userInterfaceStyle?: 'unspecified' | 'light' | 'dark',
   onDismiss?: ?() => void,
   ...
 };
@@ -38,7 +37,7 @@ type Options = {
 /**
  * Launches an alert dialog with the specified title and message.
  *
- * See http://facebook.github.io/react-native/docs/alert.html
+ * See https://reactnative.dev/docs/alert
  */
 class Alert {
   static alert(
@@ -48,8 +47,18 @@ class Alert {
     options?: Options,
   ): void {
     if (Platform.OS === 'ios') {
-      Alert.prompt(title, message, buttons, 'default');
+      Alert.prompt(
+        title,
+        message,
+        buttons,
+        'default',
+        undefined,
+        undefined,
+        options,
+      );
     } else if (Platform.OS === 'android') {
+      const NativeDialogManagerAndroid =
+        require('../NativeModules/specs/NativeDialogManagerAndroid').default;
       if (!NativeDialogManagerAndroid) {
         return;
       }
@@ -84,20 +93,25 @@ class Alert {
         config.buttonPositive = buttonPositive.text || defaultPositiveText;
       }
 
+      /* $FlowFixMe[missing-local-annot] The type annotation(s) required by
+       * Flow's LTI update could not be added via codemod */
       const onAction = (action, buttonKey) => {
         if (action === constants.buttonClicked) {
           if (buttonKey === constants.buttonNeutral) {
+            // $FlowFixMe[incompatible-type]
             buttonNeutral.onPress && buttonNeutral.onPress();
           } else if (buttonKey === constants.buttonNegative) {
+            // $FlowFixMe[incompatible-type]
             buttonNegative.onPress && buttonNegative.onPress();
           } else if (buttonKey === constants.buttonPositive) {
+            // $FlowFixMe[incompatible-type]
             buttonPositive.onPress && buttonPositive.onPress();
           }
         } else if (action === constants.dismissed) {
           options && options.onDismiss && options.onDismiss();
         }
       };
-      const onError = errorMessage => console.warn(errorMessage);
+      const onError = (errorMessage: string) => console.warn(errorMessage);
       NativeDialogManagerAndroid.showAlert(config, onError, onAction);
     }
   }
@@ -109,34 +123,14 @@ class Alert {
     type?: ?AlertType = 'plain-text',
     defaultValue?: string,
     keyboardType?: string,
+    options?: Options,
   ): void {
     if (Platform.OS === 'ios') {
-      if (typeof type === 'function') {
-        console.warn(
-          'You passed a callback function as the "type" argument to Alert.prompt(). React Native is ' +
-            'assuming  you want to use the deprecated Alert.prompt(title, defaultValue, buttons, callback) ' +
-            'signature. The current signature is Alert.prompt(title, message, callbackOrButtons, type, defaultValue, ' +
-            'keyboardType) and the old syntax will be removed in a future version.',
-        );
-
-        const callback = type;
-        RCTAlertManager.alertWithArgs(
-          {
-            title: title || '',
-            type: 'plain-text',
-            defaultValue: message || '',
-          },
-          (id, value) => {
-            callback(value);
-          },
-        );
-        return;
-      }
-
-      let callbacks = [];
+      let callbacks: Array<?any> = [];
       const buttons = [];
       let cancelButtonKey;
       let destructiveButtonKey;
+      let preferredButtonKey;
       if (typeof callbackOrButtons === 'function') {
         callbacks = [callbackOrButtons];
       } else if (Array.isArray(callbackOrButtons)) {
@@ -147,8 +141,11 @@ class Alert {
           } else if (btn.style === 'destructive') {
             destructiveButtonKey = String(index);
           }
+          if (btn.isPreferred) {
+            preferredButtonKey = String(index);
+          }
           if (btn.text || index < (callbackOrButtons || []).length - 1) {
-            const btnDef = {};
+            const btnDef: {[number]: string} = {};
             btnDef[index] = btn.text || '';
             buttons.push(btnDef);
           }
@@ -164,7 +161,9 @@ class Alert {
           defaultValue,
           cancelButtonKey,
           destructiveButtonKey,
+          preferredButtonKey,
           keyboardType,
+          userInterfaceStyle: options?.userInterfaceStyle || undefined,
         },
         (id, value) => {
           const cb = callbacks[id];

package/Libraries/Alert/Alert.windows.js

@@ -4,37 +4,37 @@
  * @flow
  * @format
  */
-'use strict';
-
-const NativeModules = require('../BatchedBridge/NativeModules');
-const AlertNative = NativeModules.Alert;
+import type {DialogOptions} from '../NativeModules/specs/NativeDialogManagerWindows';
+const NativeDialogManagerWindows =
+  require('../NativeModules/specs/NativeDialogManagerWindows').default;
 
+export type AlertType =
+  | 'default'
+  | 'plain-text'
+  | 'secure-text'
+  | 'login-password';
+export type AlertButtonStyle = 'default' | 'cancel' | 'destructive';
 export type Buttons = Array<{
   text?: string,
   onPress?: ?Function,
+  isPreferred?: boolean,
   style?: AlertButtonStyle,
   ...
 }>;
 
 type Options = {
   cancelable?: ?boolean,
+  userInterfaceStyle?: 'unspecified' | 'light' | 'dark',
   onDismiss?: ?() => void,
+  rootTag?: number,
   ...
 };
 
-export type AlertType = $Keys<{
-  default: string,
-  'plain-text': string,
-  'secure-text': string,
-  'login-password': string,
-}>;
-
-export type AlertButtonStyle = $Keys<{
-  default: string,
-  cancel: string,
-  destructive: string,
-}>;
-
+/**
+ * Launches an alert dialog with the specified title and message.
+ *
+ * See https://reactnative.dev/docs/alert
+ */
 class Alert {
   static alert(
     title: ?string,
@@ -42,33 +42,75 @@ class Alert {
     buttons?: Buttons,
     options?: Options,
   ): void {
+    if (!NativeDialogManagerWindows) {
+      return;
+    }
+    const constants = NativeDialogManagerWindows.getConstants();
+
+    const config: DialogOptions = {
+      title: title || '',
+      message: message || '',
+      cancelable: false,
+      rootTag: options && options.rootTag,
+    };
+
+    if (options && options.cancelable) {
+      config.cancelable = options.cancelable;
+    }
     // At most three buttons (neutral, negative, positive). Ignore rest.
     // The text 'OK' should be probably localized. iOS Alert does that in native.
+    const defaultPositiveText = 'OK';
     const validButtons: Buttons = buttons
       ? buttons.slice(0, 3)
-      : [{text: 'OK'}];
+      : [{text: defaultPositiveText, style: 'default'}];
     const buttonPositive = validButtons.pop();
     const buttonNegative = validButtons.pop();
     const buttonNeutral = validButtons.pop();
 
-    let args = {
-      title: title || '',
-      message: message || '',
-      cancelable: options ? options.cancelable : null,
-      buttonNeutral: buttonNeutral ? buttonNeutral.text : '',
-      buttonNegative: buttonNegative ? buttonNegative.text : '',
-      buttonPositive: buttonPositive ? buttonPositive.text : '',
-    };
+    // Find the first button where 'default' is set to true
+    // in order of declared buttons.
+    const defaultIndex = [
+      buttonNeutral,
+      buttonNegative,
+      buttonPositive,
+    ].findIndex(b => b != null && b.style === 'default');
 
-    AlertNative.showAlert(args, (actionResult: string) => {
-      if (actionResult === 'neutral') {
-        buttonNeutral && buttonNeutral.onPress && buttonNeutral.onPress();
-      } else if (actionResult === 'negative') {
-        buttonNegative && buttonNegative.onPress && buttonNegative.onPress();
-      } else if (actionResult === 'positive') {
-        buttonPositive && buttonPositive.onPress && buttonPositive.onPress();
+    // XAML has an enum to specify the default button, which is:
+    //   None = 0, Primary = 1, Secondary = 2, Close = 3
+    // If no default button is found, specify 0 for None, otherwise
+    // convert the index to its corresponding XAML enum value.
+    config.defaultButton = defaultIndex >= 0 ? 3 - defaultIndex : 0;
+
+    if (buttonNeutral) {
+      config.buttonNeutral = buttonNeutral.text || '';
+    }
+    if (buttonNegative) {
+      config.buttonNegative = buttonNegative.text || '';
+    }
+    if (buttonPositive) {
+      config.buttonPositive = buttonPositive.text || defaultPositiveText;
+    }
+
+    /* $FlowFixMe[missing-local-annot] The type annotation(s) required by
+     * Flow's LTI update could not be added via codemod */
+    const onAction = (action, buttonKey) => {
+      if (action === constants.buttonClicked) {
+        if (buttonKey === constants.buttonNeutral) {
+          // $FlowFixMe[incompatible-type]
+          buttonNeutral.onPress && buttonNeutral.onPress();
+        } else if (buttonKey === constants.buttonNegative) {
+          // $FlowFixMe[incompatible-type]
+          buttonNegative.onPress && buttonNegative.onPress();
+        } else if (buttonKey === constants.buttonPositive) {
+          // $FlowFixMe[incompatible-type]
+          buttonPositive.onPress && buttonPositive.onPress();
+        }
+      } else if (action === constants.dismissed) {
+        options && options.onDismiss && options.onDismiss();
       }
-    });
+    };
+    const onError = (errorMessage: string) => console.warn(errorMessage);
+    NativeDialogManagerWindows.showAlert(config, onError, onAction);
   }
 
   static prompt(
@@ -78,6 +120,7 @@ class Alert {
     type?: ?AlertType = 'plain-text',
     defaultValue?: string,
     keyboardType?: string,
+    options?: Options,
   ): void {
     throw new Error(
       'Alert.prompt not currently implemented in react-native-windows',

package/Libraries/Alert/NativeAlertManager.js

@@ -1,34 +1,13 @@
 /**
- * Copyright (c) Facebook, Inc. and its affiliates.
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @flow
+ * @flow strict-local
  * @format
  */
 
-'use strict';
-
-import type {TurboModule} from '../TurboModule/RCTExport';
-import * as TurboModuleRegistry from '../TurboModule/TurboModuleRegistry';
-
-export type Args = {|
-  title?: string,
-  message?: string,
-  buttons?: Array<Object>, // TODO: have a better type
-  type?: string,
-  defaultValue?: string,
-  cancelButtonKey?: string,
-  destructiveButtonKey?: string,
-  keyboardType?: string,
-|};
-
-export interface Spec extends TurboModule {
-  +alertWithArgs: (
-    args: Args,
-    callback: (id: number, value: string) => void,
-  ) => void;
-}
-
-export default (TurboModuleRegistry.get<Spec>('AlertManager'): ?Spec);
+export * from '../../src/private/specs/modules/NativeAlertManager';
+import NativeAlertManager from '../../src/private/specs/modules/NativeAlertManager';
+export default NativeAlertManager;

package/Libraries/Alert/RCTAlertManager.android.js

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) Facebook, Inc. and its affiliates.
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -7,14 +7,12 @@
  * @format
  */
 
-'use strict';
-
 import NativeDialogManagerAndroid from '../NativeModules/specs/NativeDialogManagerAndroid';
 
 function emptyCallback() {}
 
 module.exports = {
-  alertWithArgs: function(args, callback) {
+  alertWithArgs: function (args, callback) {
     // TODO(5998984): Polyfill it correctly with DialogManagerAndroid
     if (!NativeDialogManagerAndroid) {
       return;

package/Libraries/Alert/RCTAlertManager.ios.js

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) Facebook, Inc. and its affiliates.
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -8,10 +8,9 @@
  * @flow strict-local
  */
 
-'use strict';
+import type {Args} from './NativeAlertManager';
 
 import NativeAlertManager from './NativeAlertManager';
-import type {Args} from './NativeAlertManager';
 
 module.exports = {
   alertWithArgs(