Skip to content

Animate value property rather than offset #9302

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
acoates-ms merged 2 commits into from
Jan 7, 2022
Merged

Animate value property rather than offset #9302

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
176efaf
Animate value property rather than offset
rozele Dec 20, 2021
d0e7ee1
Change files
rozele Dec 20, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions change/react-native-windows-f6c9b8a9-e496-4be1-a2a5-ad3a4a9bece8.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "prerelease",
"comment": "Animate value property rather than offset",
"packageName": "react-native-windows",
"email": "erozell@outlook.com",
"dependentChangeType": "patch"
}
5 changes: 2 additions & 3 deletions vnext/Microsoft.ReactNative/Modules/Animated/AnimationDriver.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ AnimationDriver::~AnimationDriver() {
void AnimationDriver::StartAnimation() {
const auto [animation, scopedBatch] = MakeAnimation(m_config);
if (auto const animatedValue = GetAnimatedValue()) {
animatedValue->PropertySet().StartAnimation(ValueAnimatedNode::s_offsetName, animation);
animatedValue->PropertySet().StartAnimation(ValueAnimatedNode::s_valueName, animation);
animatedValue->AddActiveAnimation(m_id);
}
scopedBatch.End();
Expand All @@ -58,7 +58,6 @@ void AnimationDriver::StartAnimation() {
if (auto manager = weakManager.lock()) {
if (auto const animatedValue = manager->GetValueAnimatedNode(tag)) {
animatedValue->RemoveActiveAnimation(id);
animatedValue->FlattenOffset();
}
manager->RemoveActiveAnimation(id);
}
Expand All @@ -70,7 +69,7 @@ void AnimationDriver::StartAnimation() {

void AnimationDriver::StopAnimation(bool ignoreCompletedHandlers) {
if (const auto animatedValue = GetAnimatedValue()) {
animatedValue->PropertySet().StopAnimation(ValueAnimatedNode::s_offsetName);
animatedValue->PropertySet().StopAnimation(ValueAnimatedNode::s_valueName);
if (!ignoreCompletedHandlers) {
animatedValue->RemoveActiveAnimation(m_id);

Expand Down
6 changes: 3 additions & 3 deletions vnext/Microsoft.ReactNative/Modules/Animated/CalculatedAnimationDriver.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,11 +37,11 @@ std::tuple<comp::CompositionAnimation, comp::CompositionScopedBatch> CalculatedA
std::chrono::milliseconds duration(static_cast<int>(keyFrames.size() / 60.0f * 1000.0f));
animation.Duration(duration);
auto normalizedProgress = 0.0f;
// We are animating the values offset property which should start at 0.
animation.InsertKeyFrame(normalizedProgress, 0.0f, easingFunction);
auto fromValue = static_cast<float>(GetAnimatedValue()->RawValue());
animation.InsertKeyFrame(normalizedProgress, fromValue, easingFunction);
for (const auto keyFrame : keyFrames) {
normalizedProgress = std::min(normalizedProgress + 1.0f / keyFrames.size(), 1.0f);
animation.InsertKeyFrame(normalizedProgress, keyFrame - static_cast<float>(m_startValue), easingFunction);
animation.InsertKeyFrame(normalizedProgress, keyFrame, easingFunction);
}

if (m_iterations == -1) {
Expand Down
2 changes: 1 addition & 1 deletion vnext/Microsoft.ReactNative/Modules/Animated/FrameAnimationDriver.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ std::tuple<comp::CompositionAnimation, comp::CompositionScopedBatch> FrameAnimat
auto fromValue = GetAnimatedValue()->RawValue();
for (auto frame : m_frames) {
normalizedProgress = std::min(normalizedProgress += step, 1.0f);
animation.InsertKeyFrame(normalizedProgress, static_cast<float>(frame * (m_toValue - fromValue)));
animation.InsertKeyFrame(normalizedProgress, static_cast<float>(fromValue + frame * (m_toValue - fromValue)));
}

if (m_iterations == -1) {
Expand Down