react-native-windows 0.69.5 → 0.70.0-preview.2

package/.flowconfig

@@ -15,6 +15,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/TouchableBounce.js
 <PROJECT_ROOT>/Libraries/Components/Touchable/TouchableHighlight.js
 <PROJECT_ROOT>/Libraries/Components/Touchable/TouchableOpacity.js
@@ -76,6 +77,7 @@ flow/
 emoji=true
 
 exact_by_default=true
+exact_empty_objects=true
 
 format.bracket_spacing=false
 
@@ -98,6 +100,8 @@ suppress_type=$FlowFixMeProps
 suppress_type=$FlowFixMeState
 suppress_type=$FlowFixMeEmpty
 
+experimental.env_mode=ssa
+
 [lints]
 sketchy-null-number=warn
 sketchy-null-mixed=warn
@@ -118,4 +122,4 @@ untyped-import
 untyped-type-import
 
 [version]
-^0.176.3
+^0.182.0

package/Chakra/ChakraHelpers.cpp

@@ -459,7 +459,7 @@ JsValueRef JSValueToStringCopy(JsValueRef obj, JsValueRef *exception) {
 }
 
 JsValueRef ValueMakeUndefined() {
-  JsValueRef value;
+  JsValueRef value = nullptr;
   JsGetUndefinedValue(&value);
   return value;
 }

package/Chakra/ChakraPlatform.cpp

@@ -27,7 +27,7 @@ JsValueRef __stdcall nowHookJNF(
     void * /*callbackState*/) {
   assert(argumentCount == 1);
   double now = nowHook != nullptr ? nowHook() : 0;
-  JsValueRef value;
+  JsValueRef value = nullptr;
   CHAKRA_ASSERTDO(JsDoubleToNumber(now, &value));
   return value;
 }

package/Chakra/ChakraValue.cpp

@@ -245,9 +245,12 @@ std::unordered_map<std::string, std::string> ChakraObject::toJSONMap() const {
 /* static */
 ChakraObject ChakraObject::create() {
   JsValueRef value;
-  JsCreateObject(&value);
-
-  return ChakraObject(value);
+  if (JsCreateObject(&value) == JsNoError) {
+    return ChakraObject(value);
+  } else {
+    assert(false && "JsCreateObject() failed.");
+    std::terminate();
+  }
 }
 
 } // namespace react

package/Chakra/ChakraValue.h

@@ -178,7 +178,7 @@ class ChakraObject {
   }
 
   static ChakraObject getGlobalObject() {
-    JsValueRef value;
+    JsValueRef value = nullptr;
     JsGetGlobalObject(&value);
     return ChakraObject(value);
   }

package/Directory.Build.props

@@ -15,12 +15,12 @@
       The PR (windows-vs-pr.yml) and CI (publish.yml() turn it back on.
     -->
     <EnableSourceLink Condition="'$(EnableSourceLink)' == ''">false</EnableSourceLink>
-    <!-- When bumping the Folly version, be sure to bump the git hash of that version's commit too. -->
-    <FollyVersion>2021.06.28.00</FollyVersion>
-    <FollyCommitHash>f434460f8a98e85f3ddb75390ddd1cc330c8f658</FollyCommitHash>
-    <!-- When bumping the fmt version, be sure to bump the git hash of that version's commit too. -->
-    <FmtVersion>7.1.3</FmtVersion>
-    <FmtCommitHash>7bdf0628b1276379886c7f6dda2cef2b3b374f0b</FmtCommitHash>
+    <!-- When bumping the Folly version, be sure to bump the git hash of that version's commit and build Folly.vcxproj (to update its cgmanifest.json) too. -->
+    <FollyVersion>2021.07.22.00</FollyVersion>
+    <FollyCommitHash>4baba28200d7446c870e96f3cdbeb492f54625d0</FollyCommitHash>
+    <!-- When bumping the fmt version, be sure to bump the git hash of that version's commit and build fmt.vcxproj (to update its cgmanifest.json) too. -->
+    <FmtVersion>8.0.0</FmtVersion>
+    <FmtCommitHash>9e8b86fd2d9806672cc73133d21780dd182bfd24</FmtCommitHash>
   </PropertyGroup>
 
   <PropertyGroup Label="Configuration">
@@ -70,4 +70,4 @@
     <RestoreUseStaticGraphEvaluation Condition="'$(BuildingInsideVisualStudio)' == 'true'">true</RestoreUseStaticGraphEvaluation>
   </PropertyGroup>
 
-</Project>
+</Project>

package/Folly/Folly.vcxproj

@@ -267,23 +267,28 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-  <Target Name="DownloadFolly" BeforeTargets="PrepareForBuild">
-    <PropertyGroup>
-      <FollyZipDir>$(IntDir)\.follyzip</FollyZipDir>
-    </PropertyGroup>
-    <Message Importance="High" Text="Downloading folly..." Condition="!Exists('$(FollyZipDir)\folly-$(FollyVersion).zip')" />
-    <DownloadFile Condition="!Exists('$(FollyZipDir)\folly-$(FollyVersion).zip')"
+  <PropertyGroup>
+    <FollyZipDir>$(FollyDir)..\.follyzip</FollyZipDir>
+    <FollyZipFile>$(FollyZipDir)\folly-$(FollyVersion).zip</FollyZipFile>
+    <CGManifestFile>$(MSBuildThisFileDirectory)cgmanifest.json</CGManifestFile>
+  </PropertyGroup>
+  <Target Name="DownloadFolly" BeforeTargets="PrepareForBuild" Inputs="$(FollyZipFile)" Outputs="$(FollyZipFile)">
+    <Message Importance="High" Text="Downloading folly..." />
+    <DownloadFile
       SourceUrl="https://github.com/facebook/folly/archive/v$(FollyVersion).zip"
-      DestinationFileName="folly-$(FollyVersion).zip"
+      DestinationFileName="$(FollyZipFile)"
       DestinationFolder="$(FollyZipDir)"
       Retries="10"/>
   </Target>
   <Target Name="UnzipFolly" BeforeTargets="PrepareForBuild" DependsOnTargets="DownloadFolly">
-    <Message Importance="High" Text="Unzipping folly to $([MSBuild]::NormalizePath($(FollyDir)..))." Condition="!Exists('$(FollyDir)folly\dynamic.h')" />
-    <Unzip Condition="!Exists('$(FollyDir)')" SourceFiles="$(FollyZipDir)\folly-$(FollyVersion).zip" DestinationFolder="$([MSBuild]::NormalizePath($(FollyDir)..))" OverwriteReadOnlyFiles="true" />
+    <Message Condition="!Exists('$(FollyDir)folly\dynamic.h')" Importance="High" Text="Unzipping folly to $([MSBuild]::NormalizePath($(FollyDir)..))." />
+    <Unzip
+      Condition="!Exists('$(FollyDir)folly\dynamic.h')"
+      SourceFiles="$(FollyZipFile)"
+      DestinationFolder="$([MSBuild]::NormalizePath($(FollyDir)..))"
+      OverwriteReadOnlyFiles="true" />
   </Target>
-  <Target Name="WriteCGManifest" BeforeTargets="PrepareForBuild" DependsOnTargets="UnzipFolly">
-    <Message Importance="High" Text="Generating $([MSBuild]::NormalizePath($(FollyDir)..))\cgmanifest.json." Condition="!Exists('$([MSBuild]::NormalizePath($(FollyDir)..))\cgmanifest.json')" />
+  <Target Name="WriteCGManifest" BeforeTargets="PrepareForBuild" DependsOnTargets="DownloadFolly" Inputs="$(FollyZipFile)" Outputs="$(CGManifestFile)">
     <PropertyGroup>
       <CGManifestText>{
     "Registrations": [
@@ -300,8 +305,9 @@
     ]
 }</CGManifestText>
     </PropertyGroup>
+    <Message Importance="High" Text="Generating $(CGManifestFile)." />
     <WriteLinesToFile
-        File="$([MSBuild]::NormalizePath($(FollyDir)..))\cgmanifest.json"
+        File="$(CGManifestFile)"
         Overwrite="true"
         Lines="$(CGManifestText)" />
   </Target>
@@ -313,7 +319,8 @@
   </ItemGroup>
   <Target Name="Deploy" />
   <!-- Reenable this task if we need to temporarily replace any folly files for fixes, while we wait for PRs to land in folly -->
-  <Target Name="ApplyFollyTemporaryPatch" BeforeTargets="PrepareForBuild" DependsOnTargets="UnzipFolly">
+  <Target Name="ApplyFollyTemporaryPatch" BeforeTargets="PrepareForBuild" DependsOnTargets="UnzipFolly" Inputs="@(TemporaryFollyPatchFiles)" Outputs="@(TemporaryFollyPatchFiles->'$(FollyDir)folly\%(RecursiveDir)%(Filename)%(Extension)')">
+    <Message Importance="High" Text="Applying temporary patches to folly." />
     <Copy DestinationFiles="@(TemporaryFollyPatchFiles->'$(FollyDir)folly\%(RecursiveDir)%(Filename)%(Extension)')" SourceFiles="@(TemporaryFollyPatchFiles)" />
   </Target>
   <ItemGroup>

package/Folly/cgmanifest.json

@@ -0,0 +1,14 @@
+{
+    "Registrations": [
+        {
+            "Component": {
+                "Type": "git",
+                "Git": {
+                  "RepositoryUrl": "https://github.com/facebook/folly",
+                  "CommitHash": "4baba28200d7446c870e96f3cdbeb492f54625d0"
+                }
+            },
+            "DevelopmentDependency": false
+        }
+    ]
+}

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];

package/Libraries/Alert/Alert.windows.js

@@ -24,6 +24,7 @@ export type Buttons = Array<{
 
 type Options = {
   cancelable?: ?boolean,
+  userInterfaceStyle?: 'unspecified' | 'light' | 'dark',
   onDismiss?: ?() => void,
   ...
 };
@@ -88,6 +89,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) {
@@ -112,6 +115,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

@@ -20,6 +20,7 @@ export type Args = {|
   cancelButtonKey?: string,
   destructiveButtonKey?: string,
   keyboardType?: string,
+  userInterfaceStyle?: string,
 |};
 
 export interface Spec extends TurboModule {

package/Libraries/Animated/Animated.js

@@ -16,8 +16,8 @@ import typeof AnimatedSectionList from './components/AnimatedSectionList';
 import typeof AnimatedText from './components/AnimatedText';
 import typeof AnimatedView from './components/AnimatedView';
 
-const AnimatedMock = require('./AnimatedMock');
-const AnimatedImplementation = require('./AnimatedImplementation');
+import * as AnimatedMock from './AnimatedMock';
+import * as AnimatedImplementation from './AnimatedImplementation';
 
 const Animated = ((Platform.isTesting
   ? AnimatedMock

package/Libraries/Animated/AnimatedEvent.js

@@ -41,7 +41,7 @@ function attachNativeEvent(
   // key path inside the `nativeEvent` object. Ex.: ['contentOffset', 'x'].
   const eventMappings = [];
 
-  const traverse = (value, path) => {
+  const traverse = (value: mixed, path: Array<string>) => {
     if (value instanceof AnimatedValue) {
       value.__makeNative(platformConfig);
 
@@ -94,8 +94,8 @@ function attachNativeEvent(
   };
 }
 
-function validateMapping(argMapping, args) {
-  const validate = (recMapping, recEvt, key) => {
+function validateMapping(argMapping: $ReadOnlyArray<?Mapping>, args: any) {
+  const validate = (recMapping: ?Mapping, recEvt: any, key: string) => {
     if (recMapping instanceof AnimatedValue) {
       invariant(
         typeof recEvt === 'number',
@@ -223,7 +223,10 @@ class AnimatedEvent {
         validatedMapping = true;
       }
 
-      const traverse = (recMapping, recEvt) => {
+      const traverse = (
+        recMapping: ?(Mapping | AnimatedValue),
+        recEvt: any,
+      ) => {
         if (recMapping instanceof AnimatedValue) {
           if (typeof recEvt === 'number') {
             recMapping.setValue(recEvt);

package/Libraries/Animated/AnimatedImplementation.js

@@ -94,7 +94,7 @@ const _combineCallbacks = function (
   config: $ReadOnly<{...AnimationConfig, ...}>,
 ) {
   if (callback && config.onComplete) {
-    return (...args) => {
+    return (...args: Array<EndResult>) => {
       config.onComplete && config.onComplete(...args);
       callback && callback(...args);
     };
@@ -308,7 +308,7 @@ const sequence = function (
   let current = 0;
   return {
     start: function (callback?: ?EndCallback) {
-      const onComplete = function (result) {
+      const onComplete = function (result: EndResult) {
         if (!result.finished) {
           callback && callback(result);
           return;
@@ -380,7 +380,7 @@ const parallel = function (
       }
 
       animations.forEach((animation, idx) => {
-        const cb = function (endResult) {
+        const cb = function (endResult: EndResult | {finished: boolean}) {
           hasEnded[idx] = true;
           doneCount++;
           if (doneCount === animations.length) {
@@ -460,6 +460,7 @@ type LoopAnimationConfig = {
 
 const loop = function (
   animation: CompositeAnimation,
+  // $FlowFixMe[prop-missing]
   {iterations = -1, resetBeforeIteration = true}: LoopAnimationConfig = {},
 ): CompositeAnimation {
   let isFinished = false;
@@ -551,6 +552,19 @@ const event = function (
   }
 };
 
+// All types of animated nodes that represent scalar numbers and can be interpolated (etc)
+type AnimatedNumeric =
+  | AnimatedAddition
+  | AnimatedDiffClamp
+  | AnimatedDivision
+  | AnimatedInterpolation<number>
+  | AnimatedModulo
+  | AnimatedMultiplication
+  | AnimatedSubtraction
+  | AnimatedValue;
+
+export type {AnimatedNumeric as Numeric};
+
 /**
  * The `Animated` library is designed to make animations fluid, powerful, and
  * easy to build and maintain. `Animated` focuses on declarative relationships

package/Libraries/Animated/AnimatedMock.js

@@ -10,6 +10,8 @@
 
 'use strict';
 
+import type {EndResult} from './animations/Animation';
+
 const {AnimatedEvent, attachNativeEvent} = require('./AnimatedEvent');
 const AnimatedImplementation = require('./AnimatedImplementation');
 const AnimatedInterpolation = require('./nodes/AnimatedInterpolation');
@@ -23,7 +25,7 @@ import type {EndCallback} from './animations/Animation';
 import type {TimingAnimationConfig} from './animations/TimingAnimation';
 import type {DecayAnimationConfig} from './animations/DecayAnimation';
 import type {SpringAnimationConfig} from './animations/SpringAnimation';
-
+import type {Numeric as AnimatedNumeric} from './AnimatedImplementation';
 import AnimatedColor from './nodes/AnimatedColor';
 
 /**
@@ -43,7 +45,7 @@ function mockAnimationStart(
     const guardedCallback =
       callback == null
         ? callback
-        : (...args) => {
+        : (...args: Array<EndResult>) => {
             if (inAnimationCallback) {
               console.warn(
                 'Ignoring recursive animation callback when running mock animations',
@@ -158,11 +160,14 @@ type LoopAnimationConfig = {
 
 const loop = function (
   animation: CompositeAnimation,
+  // $FlowFixMe[prop-missing]
   {iterations = -1}: LoopAnimationConfig = {},
 ): CompositeAnimation {
   return emptyAnimation;
 };
 
+export type {AnimatedNumeric as Numeric};
+
 module.exports = {
   Value: AnimatedValue,
   ValueXY: AnimatedValueXY,