Skip to content
This repository was archived by the owner on Aug 30, 2023. It is now read-only.

Commit 4baa996

Browse files
authored
If settlingDuration is unavailable, use the provided spring duration. (#5)
* If settlingDuration is unavailable, use the provided spring duration. * Fix the tests.
1 parent 6f84058 commit 4baa996

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

src/MDMMotionAnimator.m

+1-1
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ - (void)addCoreAnimationTracer:(void (^)(CALayer *, CAAnimation *))tracer {
184184
if ([spring respondsToSelector:@selector(settlingDuration)]) {
185185
spring.duration = spring.settlingDuration;
186186
} else {
187-
spring.duration = 1;
187+
spring.duration = timing.duration;
188188
}
189189
animation = spring;
190190
break;

tests/unit/MotionAnimatorTests.m

+5-1
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,11 @@ - (void)testSpringAnimationFloatValue {
146146

147147
XCTAssertEqual(springAnimation.keyPath, keyPath);
148148

149-
XCTAssertEqual(springAnimation.duration, springAnimation.settlingDuration);
149+
if ([springAnimation respondsToSelector:@selector(settlingDuration)]) {
150+
XCTAssertEqual(springAnimation.duration, springAnimation.settlingDuration);
151+
} else {
152+
XCTAssertEqual(springAnimation.duration, timing.duration);
153+
}
150154
XCTAssertGreaterThan(springAnimation.beginTime, 0);
151155

152156
XCTAssertTrue(springAnimation.additive);

0 commit comments

Comments
 (0)