Add support for animating anchorPoint. (#97)

material-motion · Dec 14, 2017 · 646b6f6 · 646b6f6
1 parent ca89662
commit 646b6f6
Show file tree

Hide file tree

Showing 8 changed files with 21 additions and 2 deletions.
diff --git a/src/MDMAnimatableKeyPaths.h b/src/MDMAnimatableKeyPaths.h
@@ -42,6 +42,16 @@
 NS_SWIFT_NAME(AnimatableKeyPath)
 typedef NSString * const MDMAnimatableKeyPath CF_TYPED_ENUM;
 
+/**
+ Anchor point.
+
+ Equivalent UIView property: N/A
+ Equivalent CALayer property: anchorPoint
+ Expected value type: CGPoint or NSValue (containing a CGPoint).
+ Additive animation supported: No.
+ */
+FOUNDATION_EXPORT MDMAnimatableKeyPath MDMKeyPathAnchorPoint NS_SWIFT_NAME(anchorPoint);
+
 /**
  Background color.
 

diff --git a/src/MDMAnimatableKeyPaths.m b/src/MDMAnimatableKeyPaths.m
@@ -16,6 +16,7 @@
 
 #import "MDMAnimatableKeyPaths.h"
 
+MDMAnimatableKeyPath MDMKeyPathAnchorPoint = @"anchorPoint";
 MDMAnimatableKeyPath MDMKeyPathBackgroundColor = @"backgroundColor";
 MDMAnimatableKeyPath MDMKeyPathBounds = @"bounds";
 MDMAnimatableKeyPath MDMKeyPathBorderWidth = @"borderWidth";

diff --git a/src/private/CABasicAnimation+MotionAnimator.m b/src/private/CABasicAnimation+MotionAnimator.m
@@ -17,6 +17,7 @@
 #import "CABasicAnimation+MotionAnimator.h"
 
 #import "CAMediaTimingFunction+MotionAnimator.h"
+#import "MDMAnimatableKeyPaths.h"
 
 #import <UIKit/UIKit.h>
 
@@ -66,7 +67,9 @@ static BOOL IsAnimationKeyPathAlwaysNonAdditive(NSString *keyPath) {
   static NSSet *nonAdditiveKeyPaths = nil;
   static dispatch_once_t onceToken;
   dispatch_once(&onceToken, ^{
-    nonAdditiveKeyPaths = [NSSet setWithArray:@[@"backgroundColor", @"opacity"]];
+    nonAdditiveKeyPaths = [NSSet setWithArray:@[MDMKeyPathAnchorPoint,
+                                                MDMKeyPathBackgroundColor,
+                                                MDMKeyPathOpacity]];
   });
 
   return [nonAdditiveKeyPaths containsObject:keyPath];

diff --git a/src/private/MDMBlockAnimations.m b/src/private/MDMBlockAnimations.m
@@ -27,7 +27,8 @@
   static NSSet *animatableKeyPaths = nil;
   static dispatch_once_t onceToken;
   dispatch_once(&onceToken, ^{
-    animatableKeyPaths = [NSSet setWithArray:@[MDMKeyPathBackgroundColor,
+    animatableKeyPaths = [NSSet setWithArray:@[MDMKeyPathAnchorPoint,
+                                               MDMKeyPathBackgroundColor,
                                                MDMKeyPathBorderWidth,
                                                MDMKeyPathBorderColor,
                                                MDMKeyPathBounds,

diff --git a/tests/unit/MotionAnimatorBehavioralTests.swift b/tests/unit/MotionAnimatorBehavioralTests.swift
@@ -43,6 +43,7 @@ class AnimatorBehavioralTests: XCTestCase {
   }
 
   private let properties: [AnimatableKeyPath: Any] = [
+    .anchorPoint: CGPoint(x: 0.2, y: 0.4),
     .backgroundColor: UIColor.blue,
     .borderWidth: 5,
     .borderColor: UIColor.red,

diff --git a/tests/unit/QuartzCoreBehavioralTests.swift b/tests/unit/QuartzCoreBehavioralTests.swift
@@ -69,6 +69,7 @@ class QuartzCoreBehavioralTests: XCTestCase {
 
   func testWhichPropertiesImplicitlyAnimateButNotAdditively() {
     let properties: [AnimatableKeyPath: Any] = [
+      .anchorPoint: CGPoint(x: 0.2, y: 0.4),
       .borderWidth: 5,
       .borderColor: UIColor.red,
       .bounds: CGRect(x: 0, y: 0, width: 123, height: 456),

diff --git a/tests/unit/UIKitBehavioralTests.swift b/tests/unit/UIKitBehavioralTests.swift
@@ -113,6 +113,7 @@ class UIKitBehavioralTests: XCTestCase {
 
   func testSomePropertiesImplicitlyAnimateButNotAdditively() {
     let baselineProperties: [AnimatableKeyPath: Any] = [
+      .anchorPoint: CGPoint(x: 0.2, y: 0.4),
       .backgroundColor: UIColor.blue,
       .opacity: 0.5,
     ]

diff --git a/tests/unit/UIKitEquivalencyTests.swift b/tests/unit/UIKitEquivalencyTests.swift
@@ -100,6 +100,7 @@ class UIKitEquivalencyTests: XCTestCase {
 
   func testSomePropertiesImplicitlyAnimateButNotAdditively() {
     let baselineProperties: [AnimatableKeyPath: Any] = [
+      .anchorPoint: CGPoint(x: 0.2, y: 0.4),
       .backgroundColor: UIColor.blue,
       .borderColor: UIColor.red,
       .opacity: 0.5,