Skip to content
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

feat(LayoutAnimation): Adds scaleXY support for LayoutAnimation #1235

Merged
merged 1 commit into from
Jul 28, 2017
Merged

feat(LayoutAnimation): Adds scaleXY support for LayoutAnimation #1235

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
43 changes: 31 additions & 12 deletions ReactWindows/ReactNative.Shared/UIManager/LayoutAnimation/BaseLayoutAnimation.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,11 @@
using System.Reactive;
#if WINDOWS_UWP
using Windows.UI.Xaml;
using Windows.UI.Xaml.Media;
using Windows.UI.Xaml.Media.Animation;
#else
using System.Windows;
using System.Windows.Media;
using System.Windows.Media.Animation;
#endif

Expand Down Expand Up @@ -40,9 +42,6 @@ protected override bool IsValid
/// <param name="dimensions">The view dimensions.</param>
protected override IObservable<Unit> CreateAnimationCore(FrameworkElement view, Dimensions dimensions)
{
var fromValue = IsReverse ? 1.0 : 0.0;
var toValue = IsReverse ? 0.0 : 1.0;

var animatedProperty = AnimatedProperty;
if (animatedProperty.HasValue)
{
Expand All @@ -51,13 +50,33 @@ protected override IObservable<Unit> CreateAnimationCore(FrameworkElement view,
switch (animatedProperty.Value)
{
case AnimatedPropertyType.Opacity:
view.Opacity = fromValue;
storyboard.Children.Add(CreateOpacityAnimation(view, fromValue, toValue));
@finally = () => view.Opacity = toValue;
var opacity = view.Opacity;
var fromOpacity = IsReverse ? opacity : 0.0;
var toOpacity = IsReverse ? 0.0 : opacity;
view.Opacity = fromOpacity;
storyboard.Children.Add(CreateDoubleAnimation(view, "Opacity", fromOpacity, toOpacity));
@finally = () => view.Opacity = toOpacity;
break;
case AnimatedPropertyType.ScaleXY:
// TODO: implement this layout animation option
throw new NotImplementedException();
var fromScale = IsReverse ? 1.0 : 0.0;
var toScale = IsReverse ? 0.0 : 1.0;
var scaleTransform = new ScaleTransform
{
CenterX = dimensions.X + dimensions.Width / 2,
CenterY = dimensions.Y + dimensions.Height / 2,
ScaleX = fromScale,
ScaleY = fromScale,
};

var originalTransform = view.RenderTransform;
var transformGroup = new TransformGroup();
transformGroup.Children.Add(originalTransform);
transformGroup.Children.Add(scaleTransform);
view.RenderTransform = transformGroup;
storyboard.Children.Add(CreateDoubleAnimation(scaleTransform, "ScaleX", fromScale, toScale));
storyboard.Children.Add(CreateDoubleAnimation(scaleTransform, "ScaleY", fromScale, toScale));
@finally = () => view.RenderTransform = originalTransform;
break;
default:
throw new InvalidOperationException(
"Missing animation for property: " + animatedProperty.Value);
Expand All @@ -70,7 +89,7 @@ protected override IObservable<Unit> CreateAnimationCore(FrameworkElement view,
"Missing animated property from the animation configuration.");
}

private Timeline CreateOpacityAnimation(FrameworkElement view, double from, double to)
private Timeline CreateDoubleAnimation(DependencyObject target, string path, double from, double to)
{
var timeline = new DoubleAnimation
{
Expand All @@ -81,11 +100,11 @@ private Timeline CreateOpacityAnimation(FrameworkElement view, double from, doub
BeginTime = Delay,
};

Storyboard.SetTarget(timeline, view);
Storyboard.SetTarget(timeline, target);
#if WINDOWS_UWP
Storyboard.SetTargetProperty(timeline, "Opacity");
Storyboard.SetTargetProperty(timeline, path);
#else
Storyboard.SetTargetProperty(timeline, new PropertyPath("Opacity"));
Storyboard.SetTargetProperty(timeline, new PropertyPath(path));
#endif

return timeline;
Expand Down