react-native-windows 0.67.0 → 0.68.0-preview.3

package/.flowconfig

@@ -19,6 +19,7 @@
 <PROJECT_ROOT>/Libraries/Components/Touchable/TouchableHighlight.js
 <PROJECT_ROOT>/Libraries/Components/Touchable/TouchableOpacity.js
 <PROJECT_ROOT>/Libraries/Components/Touchable/TouchableWithoutFeedback.js
+<PROJECT_ROOT>/Libraries/Components/View/ReactNativeViewAttributes.js
 <PROJECT_ROOT>/Libraries/Components/View/ReactNativeViewViewConfig.js
 <PROJECT_ROOT>/Libraries/Components/View/ViewAccessibility.js
 <PROJECT_ROOT>/Libraries/Components/View/ViewPropTypes.js
@@ -29,7 +30,6 @@
 <PROJECT_ROOT>/Libraries/NewAppScreen/components/DebugInstructions.js
 <PROJECT_ROOT>/Libraries/NewAppScreen/components/ReloadInstructions.js
 <PROJECT_ROOT>/Libraries/Pressability/Pressability.js
-<PROJECT_ROOT>/Libraries/Text/TextNativeComponent.js
 <PROJECT_ROOT>/Libraries/Types/CoreEventTypes.js
 
 ; Ignore react-native files in node_modules since they are copied into project root
@@ -75,7 +75,6 @@ flow/
 emoji=true
 
 exact_by_default=true
-indexed_access=false
 
 format.bracket_spacing=false
 
@@ -119,4 +118,4 @@ untyped-import
 untyped-type-import
 
 [version]
-^0.162.0
+^0.170.0

package/Directory.Build.props

@@ -7,13 +7,10 @@
   <PropertyGroup>
     <SolutionDir Condition="'$(SolutionDir)' == '' OR '$(SolutionDir)' == '*Undefined*'">$(MSBuildThisFileDirectory)</SolutionDir>
 
-    <Platform Condition="'$(Platform)' == ''">x64</Platform>
-    <Configuration Condition="'$(Configuration)' == ''">Debug</Configuration>
-
     <!-- This property sets the CscTask to print the full path of the csharp file on errors and warnings rather than just the filename. -->
     <GenerateFullPaths>true</GenerateFullPaths>
 
-    <!-- 
+    <!--
       SourceLink is disabled by default since customer projects are still building our projects and therefore we don't want to force customers to use this.
       The PR (windows-vs-pr.yml) and CI (publish.yml() turn it back on.
     -->
@@ -24,6 +21,22 @@
 
   <PropertyGroup Label="Configuration">
     <ProjectName Condition="'$(ProjectName)'==''">$(MSBuildProjectName)</ProjectName>
+
+    <RootIntDir Condition="'$(RootIntDir)' == ''">$(ReactNativeWindowsDir)build</RootIntDir>
+    <RootOutDir Condition="'$(RootOutDir)' == ''">$(ReactNativeWindowsDir)target</RootOutDir>
+    <!-- Visual Studio forces using 'Win32' for the 'x86' platform. -->
+    <BaseIntDir Condition="'$(BaseIntDir)' == '' AND '$(Platform)' == 'Win32'">$(RootIntDir)\x86\$(Configuration)</BaseIntDir>
+    <BaseIntDir Condition="'$(BaseIntDir)' == '' AND '$(Platform)' != 'Win32'">$(RootIntDir)\$(Platform)\$(Configuration)</BaseIntDir>
+    <BaseOutDir Condition="'$(BaseOutDir)' == '' AND '$(Platform)' == 'Win32'">$(RootOutDir)\x86\$(Configuration)</BaseOutDir>
+    <BaseOutDir Condition="'$(BaseOutDir)' == '' AND '$(Platform)' != 'Win32'">$(RootOutDir)\$(Platform)\$(Configuration)</BaseOutDir>
+
+    <IntDir Condition="'$(ProjectName)' != ''">$(BaseIntDir)\$(ProjectName)\</IntDir>
+    <IntDir Condition="'$(ProjectName)' == ''">$(BaseIntDir)\$(MSBuildProjectName)\</IntDir>
+    <OutDir Condition="'$(ProjectName)' != ''">$(BaseOutDir)\$(ProjectName)\</OutDir>
+    <OutDir Condition="'$(ProjectName)' == ''">$(BaseOutDir)\$(MSBuildProjectName)\</OutDir>
+
+    <PublishDir>$(OutDir)\Publish\</PublishDir>
+    <GeneratedFilesDir>$(IntDir)Generated Files\</GeneratedFilesDir>
   </PropertyGroup>
 
   <!--
@@ -33,30 +46,21 @@
   -->
   <PropertyGroup>
     <ReactNativeWindowsDir Condition="'$(ReactNativeWindowsDir)' == ''">$(MSBuildThisFileDirectory)</ReactNativeWindowsDir>
-    <ReactNativePackageDir Condition="'$(ReactNativePackageDir)' == ''">$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), 'node_modules\react-native\package.json'))\node_modules\react-native\</ReactNativePackageDir>
 
-    <RootIntDir>$(ReactNativeWindowsDir)\build</RootIntDir>
-    <RootOutDir>$(ReactNativeWindowsDir)\target</RootOutDir>
-    <!-- Visual Studio forces using 'Win32' for the 'x86' platform. -->
-    <BaseIntDir Condition="'$(Platform)' != 'Win32'">$(RootIntDir)\$(Platform)\$(Configuration)</BaseIntDir>
-    <BaseIntDir Condition="'$(Platform)' == 'Win32'">$(RootIntDir)\x86\$(Configuration)</BaseIntDir>
-    <BaseOutDir Condition="'$(Platform)' != 'Win32'">$(RootOutDir)\$(Platform)\$(Configuration)</BaseOutDir>
-    <BaseOutDir Condition="'$(Platform)' == 'Win32'">$(RootOutDir)\x86\$(Configuration)</BaseOutDir>
-
-    <IntDir>$(BaseIntDir)\$(ProjectName)\</IntDir>
-    <OutDir>$(BaseOutDir)\$(ProjectName)\</OutDir>
-    <PublishDir>$(OutDir)\Publish\</PublishDir>
-
-    <GeneratedFilesDir>$(IntDir)Generated Files\</GeneratedFilesDir>
-    <ReactNativeDir Condition="'$(ReactNativeDir)' == ''">$(ReactNativePackageDir)</ReactNativeDir>
+    <ReactNativeDir Condition="'$(ReactNativeDir)' == ''">$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), 'node_modules\react-native\package.json'))\node_modules\react-native\</ReactNativeDir>
 
     <YogaDir Condition="'$(YogaDir)' == ''">$(ReactNativeDir)ReactCommon\yoga</YogaDir>
 
-    <FollyDir Condition="'$(FollyDir)' == '' AND Exists('$([MSBuild]::NormalizeDirectory($(ReactNativePackageDir)..\..\node_modules))')">$(ReactNativePackageDir)..\..\node_modules\.folly\folly-$(FollyVersion)</FollyDir>
+    <FollyDir Condition="'$(FollyDir)' == '' AND Exists('$([MSBuild]::NormalizeDirectory($(ReactNativeDir)..\..\node_modules))')">$(ReactNativeDir)..\..\node_modules\.folly\folly-$(FollyVersion)</FollyDir>
     <FollyDir>$([MSBuild]::NormalizeDirectory($(FollyDir)))</FollyDir>
 
-    <FmtDir Condition="'$(FmtDir)' == '' AND Exists('$([MSBuild]::NormalizeDirectory($(ReactNativePackageDir)..\..\node_modules))')">$(ReactNativePackageDir)..\..\node_modules\.fmt\fmt-$(FmtVersion)</FmtDir>
+    <FmtDir Condition="'$(FmtDir)' == '' AND Exists('$([MSBuild]::NormalizeDirectory($(ReactNativeDir)..\..\node_modules))')">$(ReactNativeDir)..\..\node_modules\.fmt\fmt-$(FmtVersion)</FmtDir>
     <FmtDir>$([MSBuild]::NormalizeDirectory($(FmtDir)))</FmtDir>
   </PropertyGroup>
 
-</Project>
+  <PropertyGroup Label="NuGet" Condition="'$(MSBuildProjectExtension)' == '.vcxproj'">
+    <!--See https://docs.microsoft.com/en-us/nuget/reference/msbuild-targets#restore-target-->
+    <RestoreUseStaticGraphEvaluation Condition="'$(BuildingInsideVisualStudio)' == 'true'">true</RestoreUseStaticGraphEvaluation>
+  </PropertyGroup>
+
+</Project>

package/Directory.Build.targets

@@ -4,66 +4,21 @@
   <!-- This import will noop when customer code is built. This import is here to help building the bits in the react-native-windows repository. -->
   <Import Condition="Exists($([MSBuild]::GetPathOfFileAbove('Directory.Build.targets', '$(MSBuildThisFileDirectory)../')))" Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.targets', '$(MSBuildThisFileDirectory)../'))" />
 
-  <!-- For build debugging purposes. -->
-  <Target Name="Vars">
-    <Message Text="General" />
-    <Message Text="=> ApplicationType         [$(ApplicationType)]" />
-    <Message Text="=> Configuration           [$(Configuration)]" />
-    <Message Text="=> Platform                [$(Platform)]" />
-    <Message Text="=> PlatformTarget          [$(PlatformTarget)]" />
-    <Message Text="=> PlatformName            [$(PlatformName)]" />
-    <Message Text="=> DefaultPlatformToolset  [$(DefaultPlatformToolset)]" />
-    <Message Text="=> PlatformToolset         [$(PlatformToolset)]" />
-    <Message Text="=> SolutionDir             [$(SolutionDir)]" />
-    <Message Text="=> RootDir                 [$(RootDir)]" />
-    <Message Text="=> RootIntDir              [$(RootIntDir)]" />
-    <Message Text="=> RootOutDir              [$(RootOutDir)]" />
-    <Message Text="=> BaseIntDir              [$(BaseIntDir)]" />
-    <Message Text="=> BaseOutDir              [$(BaseOutDir)]" />
-    <Message Text="=> IntDir                  [$(IntDir)]" />
-    <Message Text="=> OutDir                  [$(OutDir)]" />
-    <Message Text="=> TargetDir               [$(TargetDir)]" />
-    <Message Text="=> TargetPath              [$(TargetPath)]" />
-    <Message Text="=> TLogLocation            [$(TLogLocation)]" />
-    <Message Text="=> LastBuildUnsuccessful   [$(LastBuildUnsuccessful)]" />
-    <Message Text="=> LastBuildState          [$(LastBuildState)]" />
-    <Message Text="=> GeneratedFilesDir       [$(GeneratedFilesDir)]" />
-    <Message Text="=> WinVer                  [$(WinVer)]" />
+  <!--Allow implicitly restoring NuGet dependencies in C++ projects using the Visual Studio IDE.-->
+  <Target Name="BeforeResolveReferences" Condition="'$(BuildingInsideVisualStudio)' == 'true' AND '$(MSBuildProjectExtension)' == '.vcxproj'">
+    <!--
+      Ensure restoring of PackageReference dependencies.
+    -->
+    <MSBuild Projects="$(MSBuildProjectFile)" Targets="Restore" Properties="RestoreProjectStyle=PackageReference" />
 
-    <Message Text="%0A" />
-    <Message Text="MSBuild" />
-    <Message Text="=> MSBuildToolsVersion     [$(MSBuildToolsVersion)]" />
-    <Message Text="=> MSBuildToolsPath        [$(MSBuildToolsPath)]" />
+    <!--
+      Ensure restoring of packages.config dependencies.
 
-    <Message Text="%0A" />
-    <Message Text="Microsoft.CppBuild.targets/MakeDirsForCl" />
-    <Message Text="=> PrecompiledHeaderOutputFile [@(CLCompile->Metadata('PrecompiledHeaderOutputFile')->DirectoryName()->Distinct())]" />
-    <Message Text="=> AssemblerListingLocation    [@(CLCompile->Metadata('AssemblerListingLocation')->DirectoryName()->Distinct())]" />
-    <Message Text="=> ObjectFileName              [@(CLCompile->Metadata('ObjectFileName')->DirectoryName()->Distinct())]" />
-    <Message Text="=> ProgramDataBaseFileName     [@(CLCompile->Metadata('ProgramDataBaseFileName')->DirectoryName()->Distinct())]" />
-    <Message Text="=> XMLDocumentationFileName    [@(CLCompile->Metadata('XMLDocumentationFileName')->DirectoryName()->Distinct())]" />
-    <Message Text="=> BrowseInformationFile       [@(CLCompile->Metadata('BrowseInformationFile')->DirectoryName()->Distinct())]" />
-    <Message Text="=> PreprocessOutputPath        [@(CLCompile->Metadata('PreprocessOutputPath')->DirectoryName()->Distinct())]" />
-    <Message Text="=> PreprocessorDefinitions     [@(CLCompile->Metadata('PreprocessorDefinitions')->Distinct())]" />
-    <Message Text="=> ClDirsToMake                [@(ClDirsToMake)]" />
-
-    <Message Text="%0A" />
-    <Message Text="=> UnmergedWinmdDirectory  [$(UnmergedWinmdDirectory)]" />
-    <Message Text="=> MergedWinmdDirectory    [$(MergedWinmdDirectory)]" />
-    <Message Text="=> FollyDir                [$(FollyDir)]" />
-    <Message Text="=> ReactNativeWindowsDir   [$(ReactNativeWindowsDir)]" />
-    <Message Text="=> ReactNativeDir          [$(ReactNativeDir)]" />
-    <Message Text="=> YogaDir                 [$(YogaDir)]" />
-    <Message Text="=> ProjectHome             [$(ProjectHome)]" />
-    <Message Text="=> UserRootDir             [$(UserRootDir)]" />
-    <Message Text="=> MSBuildExtensionsPath   [$(MSBuildExtensionsPath)]" />
-    <Message Text="=> MSBuildExtensionsPath32 [$(MSBuildExtensionsPath32)]" />
-    <Message Text="=> MSBuildExtensionsPath64 [$(MSBuildExtensionsPath64)]" />
-    <Message Text="=> VCTargetsPath           [$(VCTargetsPath)]" />
-
-    <Message Text="%0A" />
-    <Message Text="JS Engine" />
-    <Message Text="=> V8AppPlatform [$(V8AppPlatform)]" />
-    <Message Text="=> V8Package     [$(V8Package)]" />
+      RestoreProjectStyle=PackagesConfig    - Required to use the packages.config mechanism
+      RestorePackagesConfig=true            - Required to use the packages.config mechanism
+      RestoreUseStaticGraphEvaluation=false - Override setting from Directory.Build.props
+    -->
+    <MSBuild Projects="$(MSBuildProjectFile)" Targets="Restore" Properties="RestoreProjectStyle=PackagesConfig;RestorePackagesConfig=true;RestoreUseStaticGraphEvaluation=false" />
   </Target>
+
 </Project>

package/Folly/Folly.vcxproj

@@ -6,9 +6,9 @@
     <ProjectName>Folly</ProjectName>
     <RootNamespace>Folly</RootNamespace>
     <DefaultLanguage>en-US</DefaultLanguage>
-    <AppContainerApplication>true</AppContainerApplication>
     <ApplicationType>Windows Store</ApplicationType>
     <ApplicationTypeRevision>10.0</ApplicationTypeRevision>
+    <AppContainerApplication>true</AppContainerApplication>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <Import Project="$(ReactNativeWindowsDir)PropertySheets\React.Cpp.props" />
@@ -232,9 +232,6 @@
       <SubType>Designer</SubType>
     </Natvis>
   </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <!-- Include Warnings.props after Microsoft.Cpp.props to change default WarningLevel -->
   <Import Project="$(ReactNativeWindowsDir)PropertySheets\Warnings.props" />
@@ -269,14 +266,7 @@
   </ItemDefinitionGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
-    <Import Project="$(SolutionDir)packages\boost.1.76.0.0\build\boost.targets" Condition="Exists('$(SolutionDir)packages\boost.1.76.0.0\build\boost.targets')" />
   </ImportGroup>
-  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
-    <PropertyGroup>
-      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
-    </PropertyGroup>
-    <Error Condition="!Exists('$(SolutionDir)packages\boost.1.76.0.0\build\boost.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)packages\boost.1.76.0.0\build\boost.targets'))" />
-  </Target>
   <Target Name="DownloadFolly" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
       <FollyZipDir>$(IntDir)\.follyzip</FollyZipDir>
@@ -319,6 +309,9 @@
   <ItemGroup>
     <TemporaryFollyPatchFiles Include="$(MSBuildThisFileDirectory)\TEMP_UntilFollyUpdate\**\*.*" />
   </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="boost" Version="1.76.0.0" />
+  </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">

package/Folly/Folly.vcxproj.filters

@@ -539,7 +539,4 @@
   <ItemGroup>
     <Natvis Include="Folly.natvis" />
   </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
 </Project>

package/Libraries/ActionSheetIOS/ActionSheetIOS.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.
@@ -18,7 +18,7 @@ import type {ProcessedColorValue} from '../StyleSheet/processColor';
 /**
  * Display action sheets and share sheets on iOS.
  *
- * See https://reactnative.dev/docs/actionsheetios.html
+ * See https://reactnative.dev/docs/actionsheetios
  */
 const ActionSheetIOS = {
   /**
@@ -36,7 +36,7 @@ const ActionSheetIOS = {
    * The 'callback' function takes one parameter, the zero-based index
    * of the selected item.
    *
-   * See https://reactnative.dev/docs/actionsheetios.html#showactionsheetwithoptions
+   * See https://reactnative.dev/docs/actionsheetios#showactionsheetwithoptions
    */
   showActionSheetWithOptions(
     options: {|
@@ -117,7 +117,7 @@ const ActionSheetIOS = {
    * - a boolean value signifying success or failure
    * - a string that, in the case of success, indicates the method of sharing
    *
-   * See https://reactnative.dev/docs/actionsheetios.html#showshareactionsheetwithoptions
+   * See https://reactnative.dev/docs/actionsheetios#showshareactionsheetwithoptions
    */
   showShareActionSheetWithOptions(
     options: Object,

package/Libraries/ActionSheetIOS/NativeActionSheetManager.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.

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.
@@ -34,7 +34,7 @@ type Options = {
 /**
  * Launches an alert dialog with the specified title and message.
  *
- * See https://reactnative.dev/docs/alert.html
+ * See https://reactnative.dev/docs/alert
  */
 class Alert {
   static alert(
@@ -46,8 +46,8 @@ class Alert {
     if (Platform.OS === 'ios') {
       Alert.prompt(title, message, buttons, 'default');
     } else if (Platform.OS === 'android') {
-      const NativeDialogManagerAndroid = require('../NativeModules/specs/NativeDialogManagerAndroid')
-        .default;
+      const NativeDialogManagerAndroid =
+        require('../NativeModules/specs/NativeDialogManagerAndroid').default;
       if (!NativeDialogManagerAndroid) {
         return;
       }

package/Libraries/Alert/Alert.windows.js

@@ -6,8 +6,8 @@
  */
 
 import type {DialogOptions} from './NativeDialogManagerWindows';
-const NativeDialogManagerWindows = require('./NativeDialogManagerWindows')
-  .default;
+const NativeDialogManagerWindows =
+  require('./NativeDialogManagerWindows').default;
 
 export type AlertType =
   | 'default'
@@ -31,7 +31,7 @@ type Options = {
 /**
  * Launches an alert dialog with the specified title and message.
  *
- * See https://reactnative.dev/docs/alert.html
+ * See https://reactnative.dev/docs/alert
  */
 class Alert {
   static alert(
@@ -70,7 +70,7 @@ class Alert {
       buttonNeutral,
       buttonNegative,
       buttonPositive,
-    ].findIndex(b => b != null && b.style === 'default');
+    ].findIndex((b) => b != null && b.style === 'default');
 
     // XAML has an enum to specify the default button, which is:
     //   None = 0, Primary = 1, Secondary = 2, Close = 3
@@ -101,7 +101,7 @@ class Alert {
         options && options.onDismiss && options.onDismiss();
       }
     };
-    const onError = errorMessage => console.warn(errorMessage);
+    const onError = (errorMessage) => console.warn(errorMessage);
     NativeDialogManagerWindows.showAlert(config, onError, onAction);
   }
 

package/Libraries/Alert/NativeAlertManager.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.

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.
@@ -12,7 +12,7 @@ import NativeDialogManagerAndroid from '../NativeModules/specs/NativeDialogManag
 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.

package/Libraries/Animated/Animated.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.

package/Libraries/Animated/AnimatedEvent.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.
@@ -19,6 +19,8 @@ const invariant = require('invariant');
 
 const {shouldUseNativeDriver} = require('./NativeAnimatedHelper');
 
+import type {PlatformConfig} from './AnimatedPlatformConfig';
+
 export type Mapping =
   | {[key: string]: Mapping, ...}
   | AnimatedValue
@@ -26,12 +28,14 @@ export type Mapping =
 export type EventConfig = {
   listener?: ?Function,
   useNativeDriver: boolean,
+  platformConfig?: PlatformConfig,
 };
 
 function attachNativeEvent(
   viewRef: any,
   eventName: string,
   argMapping: $ReadOnlyArray<?Mapping>,
+  platformConfig: ?PlatformConfig,
 ): {detach: () => void} {
   // Find animated values in `argMapping` and create an array representing their
   // key path inside the `nativeEvent` object. Ex.: ['contentOffset', 'x'].
@@ -39,7 +43,7 @@ function attachNativeEvent(
 
   const traverse = (value, path) => {
     if (value instanceof AnimatedValue) {
-      value.__makeNative();
+      value.__makeNative(platformConfig);
 
       eventMappings.push({
         nativeEventPath: path,
@@ -145,9 +149,9 @@ function validateMapping(argMapping, args) {
 class AnimatedEvent {
   _argMapping: $ReadOnlyArray<?Mapping>;
   _listeners: Array<Function> = [];
-  _callListeners: Function;
   _attachedEvent: ?{detach: () => void, ...};
   __isNative: boolean;
+  __platformConfig: ?PlatformConfig;
 
   constructor(argMapping: $ReadOnlyArray<?Mapping>, config: EventConfig) {
     this._argMapping = argMapping;
@@ -160,9 +164,9 @@ class AnimatedEvent {
     if (config.listener) {
       this.__addListener(config.listener);
     }
-    this._callListeners = this._callListeners.bind(this);
     this._attachedEvent = null;
     this.__isNative = shouldUseNativeDriver(config);
+    this.__platformConfig = config.platformConfig;
   }
 
   __addListener(callback: Function): void {
@@ -183,6 +187,7 @@ class AnimatedEvent {
       viewRef,
       eventName,
       this._argMapping,
+      this.__platformConfig,
     );
   }
 
@@ -245,9 +250,9 @@ class AnimatedEvent {
     };
   }
 
-  _callListeners(...args: any) {
+  _callListeners = (...args: any) => {
     this._listeners.forEach(listener => listener(...args));
-  }
+  };
 }
 
 module.exports = {AnimatedEvent, attachNativeEvent};