@office-iss/react-native-win32 0.69.0-preview.4 → 0.70.0-preview.2

package/.eslintrc.js

@@ -13,7 +13,6 @@ module.exports = {
         rules: {
           '@typescript-eslint/no-unnecessary-condition': 'off',
           'no-restricted-syntax': 'off',
-          '@typescript-eslint/no-unused-vars': 'off',
         },
       },
     ],

package/.flowconfig

@@ -14,6 +14,7 @@
 <PROJECT_ROOT>/Libraries/Components/SafeAreaView/SafeAreaView.js
 <PROJECT_ROOT>/Libraries/Components/TextInput/TextInput.js
 <PROJECT_ROOT>/Libraries/Components/TextInput/TextInputState.js
+<PROJECT_ROOT>/Libraries/Components/Touchable/Touchable.js
 <PROJECT_ROOT>/Libraries/Components/Touchable/TouchableNativeFeedback.js
 <PROJECT_ROOT>/Libraries/Components/View/ReactNativeViewAttributes.js
 <PROJECT_ROOT>/Libraries/Components/View/View.js
@@ -78,6 +79,7 @@ flow/
 emoji=true
 
 exact_by_default=true
+exact_empty_objects=true
 
 format.bracket_spacing=false
 
@@ -100,6 +102,8 @@ suppress_type=$FlowFixMeProps
 suppress_type=$FlowFixMeState
 suppress_type=$FlowFixMeEmpty
 
+experimental.env_mode=ssa
+
 [lints]
 sketchy-null-number=warn
 sketchy-null-mixed=warn
@@ -120,4 +124,4 @@ untyped-import
 untyped-type-import
 
 [version]
-^0.176.3
+^0.182.0

package/CHANGELOG.json

@@ -2,73 +2,277 @@
   "name": "@office-iss/react-native-win32",
   "entries": [
     {
-      "date": "Mon, 13 Jun 2022 15:10:29 GMT",
-      "tag": "@office-iss/react-native-win32_v0.69.0-preview.4",
-      "version": "0.69.0-preview.4",
+      "date": "Tue, 23 Aug 2022 23:36:27 GMT",
+      "tag": "@office-iss/react-native-win32_v0.70.0-preview.2",
+      "version": "0.70.0-preview.2",
       "comments": {
         "prerelease": [
           {
             "author": "34109996+chiaramooney@users.noreply.github.com",
             "package": "@office-iss/react-native-win32",
-            "commit": "014e0289748121cb0fc11393a98404f145b53b1c",
-            "comment": "Integrate RC6"
+            "commit": "144a31db1774e3a88528560956483c63e5665b1d",
+            "comment": "Resolve Conflicts"
           },
           {
             "author": "beachball",
             "package": "@office-iss/react-native-win32",
-            "comment": "Bump @react-native-windows/virtualized-list to v0.69.0-preview.3",
-            "commit": "a04f5f19cb869db2b5ceea5e73c4096842e57ed4"
+            "comment": "Bump @react-native-windows/virtualized-list to v0.70.0-preview.2",
+            "commit": "144a31db1774e3a88528560956483c63e5665b1d"
           }
         ]
       }
     },
     {
-      "date": "Mon, 06 Jun 2022 15:09:03 GMT",
-      "tag": "@office-iss/react-native-win32_v0.69.0-preview.3",
-      "version": "0.69.0-preview.3",
+      "date": "Mon, 22 Aug 2022 20:20:06 GMT",
+      "tag": "@office-iss/react-native-win32_v0.70.0-preview.1",
+      "version": "0.70.0-preview.1",
       "comments": {
         "prerelease": [
+          {
+            "author": "34109996+chiaramooney@users.noreply.github.com",
+            "package": "@office-iss/react-native-win32",
+            "commit": "b4acd4f5d8015a953cde246e1f612f44a0767e97",
+            "comment": "Promote 0.70 to preview"
+          },
+          {
+            "author": "beachball",
+            "package": "@office-iss/react-native-win32",
+            "comment": "Bump @react-native-windows/virtualized-list to v0.70.0-preview.1",
+            "commit": "a5034fc1c5336413a381652b8edefc1b4ca76832"
+          }
+        ]
+      }
+    },
+    {
+      "date": "Sat, 20 Aug 2022 05:08:53 GMT",
+      "tag": "@office-iss/react-native-win32_v0.0.0-canary.158",
+      "version": "0.0.0-canary.158",
+      "comments": {
+        "prerelease": [
+          {
+            "author": "34109996+chiaramooney@users.noreply.github.com",
+            "package": "@office-iss/react-native-win32",
+            "commit": "409648078984fc75c56d990aa2c151f419131eb3",
+            "comment": "Integrate 7/14"
+          },
           {
             "author": "beachball",
             "package": "@office-iss/react-native-win32",
-            "comment": "Bump @react-native-windows/virtualized-list to v0.69.0-preview.2",
-            "commit": "55fc1addf2b30c941a64ca361f78549caac88230"
+            "comment": "Bump @react-native-windows/virtualized-list to v0.0.0-canary.49",
+            "commit": "0a49d9c313261cae2876122cd28bb1110219fb60"
           }
         ]
       }
     },
     {
-      "date": "Mon, 16 May 2022 15:09:01 GMT",
-      "tag": "@office-iss/react-native-win32_v0.69.0-preview.2",
-      "version": "0.69.0-preview.2",
+      "date": "Wed, 03 Aug 2022 05:09:40 GMT",
+      "tag": "@office-iss/react-native-win32_v0.0.0-canary.157",
+      "version": "0.0.0-canary.157",
+      "comments": {
+        "prerelease": [
+          {
+            "author": "34109996+chiaramooney@users.noreply.github.com",
+            "package": "@office-iss/react-native-win32",
+            "commit": "d521a4704a276ec138073c14f5e37d0094fca7f2",
+            "comment": "Integrate 7/4"
+          },
+          {
+            "author": "beachball",
+            "package": "@office-iss/react-native-win32",
+            "comment": "Bump @react-native-windows/virtualized-list to v0.0.0-canary.48",
+            "commit": "a4e3b6ddea368f38b71b0a776b2952bd1653c44f"
+          }
+        ]
+      }
+    },
+    {
+      "date": "Tue, 12 Jul 2022 05:10:12 GMT",
+      "tag": "@office-iss/react-native-win32_v0.0.0-canary.156",
+      "version": "0.0.0-canary.156",
       "comments": {
         "prerelease": [
           {
             "author": "jthysell@microsoft.com",
             "package": "@office-iss/react-native-win32",
-            "commit": "70ed2cf44501f1ac1951638154915bc14f073406",
-            "comment": "Upgrade to @react-native-community/cli@8.0.0-alpha.6"
+            "commit": "24b8aafe312aece0f8d3d4049b80f94bc078080b",
+            "comment": "CG: Remove dependency on deprecated `hermes-engine` package"
+          }
+        ]
+      }
+    },
+    {
+      "date": "Fri, 17 Jun 2022 05:10:04 GMT",
+      "tag": "@office-iss/react-native-win32_v0.0.0-canary.155",
+      "version": "0.0.0-canary.155",
+      "comments": {
+        "prerelease": [
+          {
+            "author": "34109996+chiaramooney@users.noreply.github.com",
+            "package": "@office-iss/react-native-win32",
+            "commit": "4b2b9ced05f9fefa5faaa3c6ec582236ffbfd500",
+            "comment": "Integrate 6/14"
+          },
+          {
+            "author": "beachball",
+            "package": "@office-iss/react-native-win32",
+            "comment": "Bump @react-native-windows/virtualized-list to v0.0.0-canary.47",
+            "commit": "4b2b9ced05f9fefa5faaa3c6ec582236ffbfd500"
+          }
+        ]
+      }
+    },
+    {
+      "date": "Fri, 10 Jun 2022 05:09:59 GMT",
+      "tag": "@office-iss/react-native-win32_v0.0.0-canary.154",
+      "version": "0.0.0-canary.154",
+      "comments": {
+        "prerelease": [
+          {
+            "author": "34109996+chiaramooney@users.noreply.github.com",
+            "package": "@office-iss/react-native-win32",
+            "commit": "72aca533cbb597d07e8ddc744f6dac9d260afbe2",
+            "comment": "Integrate 6/8"
+          },
+          {
+            "author": "beachball",
+            "package": "@office-iss/react-native-win32",
+            "comment": "Bump @react-native-windows/virtualized-list to v0.0.0-canary.46",
+            "commit": "6688554a96e3df80111c2eec9c11279351ba0e5f"
           }
         ]
       }
     },
     {
-      "date": "Wed, 04 May 2022 23:30:22 GMT",
-      "tag": "@office-iss/react-native-win32_v0.69.0-preview.1",
-      "version": "0.69.0-preview.1",
+      "date": "Thu, 09 Jun 2022 05:09:48 GMT",
+      "tag": "@office-iss/react-native-win32_v0.0.0-canary.153",
+      "version": "0.0.0-canary.153",
+      "comments": {
+        "prerelease": [
+          {
+            "author": "tatianakapos@microsoft.com",
+            "package": "@office-iss/react-native-win32",
+            "commit": "c8b1cae46b586d81561df23c2071bad15a3afa5b",
+            "comment": "integrate-6-3-22"
+          },
+          {
+            "author": "beachball",
+            "package": "@office-iss/react-native-win32",
+            "comment": "Bump @react-native-windows/virtualized-list to v0.0.0-canary.45",
+            "commit": "72b5d9301e9878448c0d1a2bf8e3b238adfa9c1b"
+          }
+        ]
+      }
+    },
+    {
+      "date": "Sat, 04 Jun 2022 05:10:04 GMT",
+      "tag": "@office-iss/react-native-win32_v0.0.0-canary.152",
+      "version": "0.0.0-canary.152",
+      "comments": {
+        "prerelease": [
+          {
+            "author": "tatianakapos@microsoft.com",
+            "package": "@office-iss/react-native-win32",
+            "commit": "5dff9fb894d2e274467a37fcac5219eca8ad0ebd",
+            "comment": "integrate 5-16-22"
+          },
+          {
+            "author": "beachball",
+            "package": "@office-iss/react-native-win32",
+            "comment": "Bump @react-native-windows/virtualized-list to v0.0.0-canary.44",
+            "commit": "5dff9fb894d2e274467a37fcac5219eca8ad0ebd"
+          },
+          {
+            "author": "beachball",
+            "package": "@office-iss/react-native-win32",
+            "comment": "Bump @rnw-scripts/just-task to v2.2.5",
+            "commit": "5dff9fb894d2e274467a37fcac5219eca8ad0ebd"
+          },
+          {
+            "author": "beachball",
+            "package": "@office-iss/react-native-win32",
+            "comment": "Bump react-native-platform-override to v1.6.13",
+            "commit": "5dff9fb894d2e274467a37fcac5219eca8ad0ebd"
+          }
+        ]
+      }
+    },
+    {
+      "date": "Thu, 12 May 2022 05:09:43 GMT",
+      "tag": "@office-iss/react-native-win32_v0.0.0-canary.151",
+      "version": "0.0.0-canary.151",
+      "comments": {
+        "prerelease": [
+          {
+            "author": "ngerlem@microsoft.com",
+            "package": "@office-iss/react-native-win32",
+            "commit": "edf2bf35d8cba11571bb5938fc0f37044e5606d5",
+            "comment": "Build/dependency fixes"
+          },
+          {
+            "author": "beachball",
+            "package": "@office-iss/react-native-win32",
+            "comment": "Bump @react-native-windows/virtualized-list to v0.0.0-canary.43",
+            "commit": "a0ce0770a6161c9a8505faa6857df80e3c7c6ad0"
+          },
+          {
+            "author": "beachball",
+            "package": "@office-iss/react-native-win32",
+            "comment": "Bump @rnw-scripts/eslint-config to v1.1.13",
+            "commit": "a0ce0770a6161c9a8505faa6857df80e3c7c6ad0"
+          },
+          {
+            "author": "beachball",
+            "package": "@office-iss/react-native-win32",
+            "comment": "Bump @rnw-scripts/jest-out-of-tree-snapshot-resolver to v1.0.7",
+            "commit": "a0ce0770a6161c9a8505faa6857df80e3c7c6ad0"
+          },
+          {
+            "author": "beachball",
+            "package": "@office-iss/react-native-win32",
+            "comment": "Bump @rnw-scripts/just-task to v2.2.4",
+            "commit": "a0ce0770a6161c9a8505faa6857df80e3c7c6ad0"
+          },
+          {
+            "author": "beachball",
+            "package": "@office-iss/react-native-win32",
+            "comment": "Bump react-native-platform-override to v1.6.12",
+            "commit": "a0ce0770a6161c9a8505faa6857df80e3c7c6ad0"
+          }
+        ]
+      }
+    },
+    {
+      "date": "Wed, 11 May 2022 05:08:51 GMT",
+      "tag": "@office-iss/react-native-win32_v0.0.0-canary.150",
+      "version": "0.0.0-canary.150",
       "comments": {
         "prerelease": [
           {
             "author": "jthysell@microsoft.com",
             "package": "@office-iss/react-native-win32",
-            "commit": "460c63a1d225ae27c0ca64a4ef0d21ea477e546b",
-            "comment": "Promote 0.69 to preview"
+            "commit": "601ce5567434a9e7b2dac151d45d641f68c7c0a4",
+            "comment": "Upgrade to @react-native-community/cli@8.0.0-alpha.6"
+          }
+        ]
+      }
+    },
+    {
+      "date": "Tue, 10 May 2022 05:08:46 GMT",
+      "tag": "@office-iss/react-native-win32_v0.0.0-canary.149",
+      "version": "0.0.0-canary.149",
+      "comments": {
+        "prerelease": [
+          {
+            "author": "tatianakapos@microsoft.com",
+            "package": "@office-iss/react-native-win32",
+            "commit": "69494f5f087d34b14a789967783fd4b3c929d40a",
+            "comment": "integrate 5-1-22"
           },
           {
             "author": "beachball",
             "package": "@office-iss/react-native-win32",
-            "comment": "Bump @react-native-windows/virtualized-list to v0.69.0-preview.1",
-            "commit": "4ec3e5663977bb8a0079f362fd35e21cf39dc636"
+            "comment": "Bump @react-native-windows/virtualized-list to v0.0.0-canary.42",
+            "commit": "75857a696c79a569bf47ac5917cd1d69009820b3"
           }
         ]
       }

package/CHANGELOG.md

@@ -1,42 +1,120 @@
 # Change Log - @office-iss/react-native-win32
 
-This log was last generated on Mon, 13 Jun 2022 15:10:29 GMT and should not be manually modified.
+This log was last generated on Tue, 23 Aug 2022 23:36:27 GMT and should not be manually modified.
 
 <!-- Start content -->
 
-## 0.69.0-preview.4
+## 0.70.0-preview.2
 
-Mon, 13 Jun 2022 15:10:29 GMT
+Tue, 23 Aug 2022 23:36:27 GMT
 
 ### Changes
 
-- Integrate RC6 (34109996+chiaramooney@users.noreply.github.com)
-- Bump @react-native-windows/virtualized-list to v0.69.0-preview.3
+- Resolve Conflicts (34109996+chiaramooney@users.noreply.github.com)
+- Bump @react-native-windows/virtualized-list to v0.70.0-preview.2
 
-## 0.69.0-preview.3
+## 0.70.0-preview.1
 
-Mon, 06 Jun 2022 15:09:03 GMT
+Mon, 22 Aug 2022 20:20:06 GMT
 
 ### Changes
 
-- Bump @react-native-windows/virtualized-list to v0.69.0-preview.2
+- Promote 0.70 to preview (34109996+chiaramooney@users.noreply.github.com)
+- Bump @react-native-windows/virtualized-list to v0.70.0-preview.1
 
-## 0.69.0-preview.2
+## 0.0.0-canary.158
 
-Mon, 16 May 2022 15:09:01 GMT
+Sat, 20 Aug 2022 05:08:53 GMT
+
+### Changes
+
+- Integrate 7/14 (34109996+chiaramooney@users.noreply.github.com)
+- Bump @react-native-windows/virtualized-list to v0.0.0-canary.49
+
+## 0.0.0-canary.157
+
+Wed, 03 Aug 2022 05:09:40 GMT
+
+### Changes
+
+- Integrate 7/4 (34109996+chiaramooney@users.noreply.github.com)
+- Bump @react-native-windows/virtualized-list to v0.0.0-canary.48
+
+## 0.0.0-canary.156
+
+Tue, 12 Jul 2022 05:10:12 GMT
+
+### Changes
+
+- CG: Remove dependency on deprecated `hermes-engine` package (jthysell@microsoft.com)
+
+## 0.0.0-canary.155
+
+Fri, 17 Jun 2022 05:10:04 GMT
+
+### Changes
+
+- Integrate 6/14 (34109996+chiaramooney@users.noreply.github.com)
+- Bump @react-native-windows/virtualized-list to v0.0.0-canary.47
+
+## 0.0.0-canary.154
+
+Fri, 10 Jun 2022 05:09:59 GMT
+
+### Changes
+
+- Integrate 6/8 (34109996+chiaramooney@users.noreply.github.com)
+- Bump @react-native-windows/virtualized-list to v0.0.0-canary.46
+
+## 0.0.0-canary.153
+
+Thu, 09 Jun 2022 05:09:48 GMT
+
+### Changes
+
+- integrate-6-3-22 (tatianakapos@microsoft.com)
+- Bump @react-native-windows/virtualized-list to v0.0.0-canary.45
+
+## 0.0.0-canary.152
+
+Sat, 04 Jun 2022 05:10:04 GMT
+
+### Changes
+
+- integrate 5-16-22 (tatianakapos@microsoft.com)
+- Bump @react-native-windows/virtualized-list to v0.0.0-canary.44
+- Bump @rnw-scripts/just-task to v2.2.5
+- Bump react-native-platform-override to v1.6.13
+
+## 0.0.0-canary.151
+
+Thu, 12 May 2022 05:09:43 GMT
+
+### Changes
+
+- Build/dependency fixes (ngerlem@microsoft.com)
+- Bump @react-native-windows/virtualized-list to v0.0.0-canary.43
+- Bump @rnw-scripts/eslint-config to v1.1.13
+- Bump @rnw-scripts/jest-out-of-tree-snapshot-resolver to v1.0.7
+- Bump @rnw-scripts/just-task to v2.2.4
+- Bump react-native-platform-override to v1.6.12
+
+## 0.0.0-canary.150
+
+Wed, 11 May 2022 05:08:51 GMT
 
 ### Changes
 
 - Upgrade to @react-native-community/cli@8.0.0-alpha.6 (jthysell@microsoft.com)
 
-## 0.69.0-preview.1
+## 0.0.0-canary.149
 
-Wed, 04 May 2022 23:30:22 GMT
+Tue, 10 May 2022 05:08:46 GMT
 
 ### Changes
 
-- Promote 0.69 to preview (jthysell@microsoft.com)
-- Bump @react-native-windows/virtualized-list to v0.69.0-preview.1
+- integrate 5-1-22 (tatianakapos@microsoft.com)
+- Bump @react-native-windows/virtualized-list to v0.0.0-canary.42
 
 ## 0.0.0-canary.148
 

package/IntegrationTests/AsyncStorageTest.js

@@ -33,7 +33,7 @@ const VAL_MERGE_EXPECT = {foo: 1, bar: {hoo: 2, boo: 1}, baz: 2, moo: {a: 3}};
 let done = (result: ?boolean) => {};
 let updateMessage = (message: string) => {};
 
-function runTestCase(description: string, fn) {
+function runTestCase(description: string, fn: () => void) {
   updateMessage(description);
   fn();
 }
@@ -61,7 +61,20 @@ function stringify(
   return JSON.stringify(value);
 }
 
-function expectEqual(lhs, rhs, testname: string) {
+function expectEqual(
+  lhs: ?(any | string | Array<Array<string>>),
+  rhs:
+    | null
+    | string
+    | {
+        bar: {boo: number, hoo: number},
+        baz: number,
+        foo: number,
+        moo: {a: number},
+      }
+    | Array<Array<string>>,
+  testname: string,
+) {
   expectTrue(
     !deepDiffer(lhs, rhs),
     'Error in test ' +
@@ -73,7 +86,10 @@ function expectEqual(lhs, rhs, testname: string) {
   );
 }
 
-function expectAsyncNoError(place, err) {
+function expectAsyncNoError(
+  place: string,
+  err: ?(Error | string | Array<Error>),
+) {
   if (err instanceof Error) {
     err = err.message;
   }
@@ -207,7 +223,7 @@ class AsyncStorageTest extends React.Component<{...}, $FlowFixMeState> {
       this.setState({done: true}, () => {
         TestModule.markTestCompleted();
       });
-    updateMessage = msg => {
+    updateMessage = (msg: string) => {
       this.setState({messages: this.state.messages.concat('\n' + msg)});
       DEBUG && console.log(msg);
     };

package/IntegrationTests/BUCK

@@ -1,4 +1,4 @@
-load("@fbsource//tools/build_defs:js_glob.bzl", "js_glob")
+load("@fbsource//tools/build_defs:js_library_glob.bzl", "js_library_glob")
 load("@fbsource//tools/build_defs/oss:metro_defs.bzl", "rn_library")
 
 # This file was generated by running
@@ -6,7 +6,7 @@ load("@fbsource//tools/build_defs/oss:metro_defs.bzl", "rn_library")
 
 rn_library(
     name = "IntegrationTests",
-    srcs = js_glob(
+    srcs = js_library_glob(
         [
             "**/*",
         ],

package/IntegrationTests/LayoutEventsTest.js

@@ -19,7 +19,7 @@ import type {ViewStyleProp} from 'react-native/Libraries/StyleSheet/StyleSheet';
 
 const deepDiffer = require('react-native/Libraries/Utilities/differ/deepDiffer');
 
-function debug(...args) {
+function debug(...args: Array<void | Layout | string>) {
   // console.log.apply(null, arguments);
 }
 
@@ -119,16 +119,19 @@ class LayoutEventsTest extends React.Component<Props, State> {
   }
 
   onViewLayout: (e: LayoutEvent) => void = (e: LayoutEvent) => {
+    // $FlowFixMe[incompatible-call]
     debug('received view layout event\n', e.nativeEvent);
     this.setState({viewLayout: e.nativeEvent.layout}, this.checkLayout);
   };
 
   onTextLayout: (e: LayoutEvent) => void = (e: LayoutEvent) => {
+    // $FlowFixMe[incompatible-call]
     debug('received text layout event\n', e.nativeEvent);
     this.setState({textLayout: e.nativeEvent.layout}, this.checkLayout);
   };
 
   onImageLayout: (e: LayoutEvent) => void = (e: LayoutEvent) => {
+    // $FlowFixMe[incompatible-call]
     debug('received image layout event\n', e.nativeEvent);
     this.setState({imageLayout: e.nativeEvent.layout}, this.checkLayout);
   };

package/IntegrationTests/{launchWebSocketServer.command → launchWebSocketServer.sh}

@@ -1,18 +1,12 @@
 #!/bin/bash
-
 # 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.
 
-# Set terminal title
-echo -en "\033]0;Web Socket Test Server\a"
-clear
-
 THIS_DIR=$(cd -P "$(dirname "$(readlink "${BASH_SOURCE[0]}" || echo "${BASH_SOURCE[0]}")")" && pwd)
-pushd "$THIS_DIR"
+pushd "$THIS_DIR" || exit
 ./websocket_integration_test_server.js
-popd
+popd || exit
 
-echo "Process terminated. Press <enter> to close the window"
-read
+echo "Process terminated."

package/Libraries/Alert/Alert.js

@@ -8,8 +8,9 @@
  * @flow
  */
 
-import Platform from '../Utilities/Platform';
 import type {DialogOptions} from '../NativeModules/specs/NativeDialogManagerAndroid';
+
+import Platform from '../Utilities/Platform';
 import RCTAlertManager from './RCTAlertManager';
 
 export type AlertType =
@@ -27,6 +28,7 @@ export type Buttons = Array<{
 
 type Options = {
   cancelable?: ?boolean,
+  userInterfaceStyle?: 'unspecified' | 'light' | 'dark',
   onDismiss?: ?() => void,
   ...
 };
@@ -44,7 +46,15 @@ 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;
@@ -82,6 +92,8 @@ 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) {
@@ -95,7 +107,7 @@ class Alert {
           options && options.onDismiss && options.onDismiss();
         }
       };
-      const onError = errorMessage => console.warn(errorMessage);
+      const onError = (errorMessage: string) => console.warn(errorMessage);
       NativeDialogManagerAndroid.showAlert(config, onError, onAction);
     }
   }
@@ -107,6 +119,7 @@ class Alert {
     type?: ?AlertType = 'plain-text',
     defaultValue?: string,
     keyboardType?: string,
+    options?: Options,
   ): void {
     if (Platform.OS === 'ios') {
       let callbacks = [];
@@ -124,7 +137,7 @@ class Alert {
             destructiveButtonKey = String(index);
           }
           if (btn.text || index < (callbackOrButtons || []).length - 1) {
-            const btnDef = {};
+            const btnDef: {[number]: string} = {};
             btnDef[index] = btn.text || '';
             buttons.push(btnDef);
           }
@@ -141,6 +154,7 @@ class Alert {
           cancelButtonKey,
           destructiveButtonKey,
           keyboardType,
+          userInterfaceStyle: options?.userInterfaceStyle || undefined,
         },
         (id, value) => {
           const cb = callbacks[id];