Skip to content

Commit a40e4ec

Browse files
committed
Merge branch 'develop' into release-candidate
2 parents 325281c + bea213a commit a40e4ec

File tree

1 file changed

+11
-5
lines changed

1 file changed

+11
-5
lines changed

components/Snackbar/src/private/MDCSnackbarOverlayView.m

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -580,12 +580,18 @@ - (void)slideMessageView:(MDCSnackbarMessageView *)snackbarView
580580
duration:duration
581581
timingFunction:timingFunction];
582582
} else {
583-
NSMutableArray *animations =
584-
[NSMutableArray arrayWithObject:[snackbarView animateSnackbarOpacityFrom:fromContentOpacity
585-
to:toContentOpacity]];
583+
NSMutableArray *animations = [[NSMutableArray alloc] init];
584+
CABasicAnimation *opacityAnimation = [snackbarView animateSnackbarOpacityFrom:fromContentOpacity
585+
to:toContentOpacity];
586+
if (opacityAnimation) {
587+
[animations addObject:opacityAnimation];
588+
}
586589
if (onscreen) {
587-
[animations addObject:[snackbarView animateSnackbarScaleFrom:MDCSnackbarEnterStartingScale
588-
toScale:1]];
590+
CABasicAnimation *scaleAnimation =
591+
[snackbarView animateSnackbarScaleFrom:MDCSnackbarEnterStartingScale toScale:1];
592+
if (scaleAnimation) {
593+
[animations addObject:scaleAnimation];
594+
}
589595
}
590596
animationsGroup.animations = animations;
591597
[snackbarView.layer addAnimation:animationsGroup forKey:@"snackbarAnimation"];

0 commit comments

Comments
 (0)