From 0a4543017e3778a5436828340c675bbb13600a6a Mon Sep 17 00:00:00 2001 From: Tom Shea Date: Fri, 3 Jan 2020 14:44:51 -0800 Subject: [PATCH 1/2] Call StartAnimatiom on m_scaleCombined for ScaleX / ScaleY animations There was a copy-paste error previously that started m_translationCombined instead. --- vnext/ReactUWP/Modules/Animated/PropsAnimatedNode.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/vnext/ReactUWP/Modules/Animated/PropsAnimatedNode.cpp b/vnext/ReactUWP/Modules/Animated/PropsAnimatedNode.cpp index 7840fd36159..79fa12bf0e7 100644 --- a/vnext/ReactUWP/Modules/Animated/PropsAnimatedNode.cpp +++ b/vnext/ReactUWP/Modules/Animated/PropsAnimatedNode.cpp @@ -110,10 +110,10 @@ void PropsAnimatedNode::StartAnimations() { uiElement.StartAnimation(m_translationCombined); } else if (anim.second.Target() == L"Scale.X") { m_subchannelPropertySet.StartAnimation(L"ScaleX", anim.second); - uiElement.StartAnimation(m_translationCombined); + uiElement.StartAnimation(m_scaleCombined); } else if (anim.second.Target() == L"Scale.Y") { m_subchannelPropertySet.StartAnimation(L"ScaleY", anim.second); - uiElement.StartAnimation(m_translationCombined); + uiElement.StartAnimation(m_scaleCombined); } else { uiElement.StartAnimation(anim.second); } From 461931737da8057e9d324c22d0c6fc803465844e Mon Sep 17 00:00:00 2001 From: Tom Shea Date: Fri, 3 Jan 2020 14:45:45 -0800 Subject: [PATCH 2/2] Change files --- ...1-03-14-45-45-fix-subchannel-animation-reference.json | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 change/react-native-windows-2020-01-03-14-45-45-fix-subchannel-animation-reference.json diff --git a/change/react-native-windows-2020-01-03-14-45-45-fix-subchannel-animation-reference.json b/change/react-native-windows-2020-01-03-14-45-45-fix-subchannel-animation-reference.json new file mode 100644 index 00000000000..e921ff91629 --- /dev/null +++ b/change/react-native-windows-2020-01-03-14-45-45-fix-subchannel-animation-reference.json @@ -0,0 +1,9 @@ +{ + "type": "prerelease", + "comment": "Call StartAnimatiom on m_scaleCombined for ScaleX / ScaleY animations", + "packageName": "react-native-windows", + "email": "thshea@microsoft.com", + "commit": "0a4543017e3778a5436828340c675bbb13600a6a", + "date": "2020-01-03T22:45:45.183Z", + "file": "D:\\projects\\react-native-windows\\change\\react-native-windows-2020-01-03-14-45-45-fix-subchannel-animation-reference.json" +} \ No newline at end of file