From c3e50c2a5ed94fff6bf595fc19e2c8db686d1118 Mon Sep 17 00:00:00 2001 From: Alexander Sklar Date: Fri, 29 Jan 2021 17:12:36 -0800 Subject: [PATCH 1/2] AllAnimations only exists on RS5 --- .../Modules/Animated/FrameAnimationDriver.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vnext/Microsoft.ReactNative/Modules/Animated/FrameAnimationDriver.cpp b/vnext/Microsoft.ReactNative/Modules/Animated/FrameAnimationDriver.cpp index 88401564893..b7830be8579 100644 --- a/vnext/Microsoft.ReactNative/Modules/Animated/FrameAnimationDriver.cpp +++ b/vnext/Microsoft.ReactNative/Modules/Animated/FrameAnimationDriver.cpp @@ -4,6 +4,7 @@ #include "pch.h" #include "FrameAnimationDriver.h" +#include "Utils/Helpers.h" namespace react::uwp { FrameAnimationDriver::FrameAnimationDriver( @@ -24,7 +25,9 @@ std::tuple FrameAnimat const auto [scopedBatch, animation] = []() { const auto compositor = Microsoft::ReactNative::GetCompositor(); return std::make_tuple( - compositor.CreateScopedBatch(comp::CompositionBatchTypes::AllAnimations), + compositor.CreateScopedBatch( + react::uwp::IsRS5OrHigher() ? comp::CompositionBatchTypes::AllAnimations + : comp::CompositionBatchTypes::Animation), compositor.CreateScalarKeyFrameAnimation()); }(); From 2d4399ebb8ec5726585ecc77f19b620db2d81b4a Mon Sep 17 00:00:00 2001 From: Alexander Sklar Date: Fri, 29 Jan 2021 17:13:20 -0800 Subject: [PATCH 2/2] Change files --- ...ative-windows-86019e9d-819a-4c5c-ace1-9c995444df70.json | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 change/react-native-windows-86019e9d-819a-4c5c-ace1-9c995444df70.json diff --git a/change/react-native-windows-86019e9d-819a-4c5c-ace1-9c995444df70.json b/change/react-native-windows-86019e9d-819a-4c5c-ace1-9c995444df70.json new file mode 100644 index 00000000000..d23e3fcff2d --- /dev/null +++ b/change/react-native-windows-86019e9d-819a-4c5c-ace1-9c995444df70.json @@ -0,0 +1,7 @@ +{ + "type": "prerelease", + "comment": "AllAnimations only exists on RS5", + "packageName": "react-native-windows", + "email": "asklar@microsoft.com", + "dependentChangeType": "patch" +}