From 3b3ae23fe2079b01f54349fd2e7f33565c0f6ffb Mon Sep 17 00:00:00 2001 From: yiminghe Date: Mon, 24 Aug 2015 00:31:49 +0800 Subject: [PATCH] update animate --- package.json | 12 ++++++------ style/core/motion.less | 4 ++-- style/core/motion/fade.less | 4 ++-- style/core/motion/move.less | 2 +- style/core/motion/slide.less | 2 +- style/core/motion/swing.less | 6 +++--- style/core/motion/zoom.less | 2 +- 7 files changed, 16 insertions(+), 16 deletions(-) diff --git a/package.json b/package.json index 0c06affda6..59ca1411c2 100644 --- a/package.json +++ b/package.json @@ -38,26 +38,26 @@ "gregorian-calendar-format": "~3.0.1", "is-equal-shallow": "~0.1.3", "object-assign": "3.x", - "rc-animate": "~1.1.0", - "rc-calendar": "~3.14.0", + "rc-animate": "~1.2.0", + "rc-calendar": "~3.14.2", "rc-checkbox": "~1.1.1", "rc-collapse": "~1.3.0", - "rc-dialog": "~5.0.1", + "rc-dialog": "~5.0.2", "rc-dropdown": "~1.3.3", "rc-form-validation": "~2.4.7", "rc-input-number": "~2.0.1", - "rc-menu": "~4.3.1", + "rc-menu": "~4.4.2", "rc-notification": "~1.1.0", "rc-pagination": "~1.1.0", "rc-progress": "~1.0.0", "rc-radio": "~2.0.0", - "rc-select": "~4.8.0", + "rc-select": "~4.8.1", "rc-slider": "~1.4.0", "rc-steps": "~1.1.4", "rc-switch": "~1.2.0", "rc-table": "~3.1.0", "rc-tabs": "~5.3.2", - "rc-tooltip": "~2.6.3", + "rc-tooltip": "~2.6.4", "rc-tree": "~0.14.3", "rc-upload": "~1.3.1", "rc-util": "~2.0.3", diff --git a/style/core/motion.less b/style/core/motion.less index 9a915c81a2..d90731dfe0 100644 --- a/style/core/motion.less +++ b/style/core/motion.less @@ -5,7 +5,7 @@ } .make-motion(@className, @keyframeName) { - .@{className}-enter { + .@{className}-enter, .@{className}-appear { .motion-common(); animation-play-state: paused; } @@ -13,7 +13,7 @@ .motion-common(); animation-play-state: paused; } - .@{className}-enter.@{className}-enter-active { + .@{className}-enter.@{className}-enter-active, .@{className}-appear.@{className}-appear-active { animation-name: ~"@{keyframeName}In"; animation-play-state: running; } diff --git a/style/core/motion/fade.less b/style/core/motion/fade.less index e4be80d825..0270b8a8ac 100644 --- a/style/core/motion/fade.less +++ b/style/core/motion/fade.less @@ -1,4 +1,4 @@ -.fade-enter { +.fade-enter, .fade-appear { opacity: 0; .motion-common(); animation-timing-function: @ease-out; @@ -11,7 +11,7 @@ animation-play-state: paused; } -.fade-enter.fade-enter-active { +.fade-enter.fade-enter-active, .fade-appear.fade-appear-active { animation-name: fadeIn; animation-play-state: running; } diff --git a/style/core/motion/move.less b/style/core/motion/move.less index ae3f2cd8eb..bab9620489 100644 --- a/style/core/motion/move.less +++ b/style/core/motion/move.less @@ -1,6 +1,6 @@ .move-motion(@className, @keyframeName) { .make-motion(@className, @keyframeName); - .@{className}-enter { + .@{className}-enter, .@{className}-appear { opacity: 0; animation-timing-function: @ease-out-circ; } diff --git a/style/core/motion/slide.less b/style/core/motion/slide.less index d59442ebf5..a643986201 100644 --- a/style/core/motion/slide.less +++ b/style/core/motion/slide.less @@ -1,6 +1,6 @@ .slide-motion(@className, @keyframeName) { .make-motion(@className, @keyframeName); - .@{className}-enter { + .@{className}-enter, .@{className}-appear { opacity: 0; animation-timing-function: @ease-out-quint; } diff --git a/style/core/motion/swing.less b/style/core/motion/swing.less index 03813736be..f48ebcff82 100644 --- a/style/core/motion/swing.less +++ b/style/core/motion/swing.less @@ -1,9 +1,9 @@ .swing-motion(@className, @keyframeName) { - .@{className}-enter { + .@{className}-enter, .@{className}-appear { .motion-common(); animation-play-state: paused; } - .@{className}-enter.@{className}-enter-active { + .@{className}-enter.@{className}-enter-active, .@{className}-appear.@{className}-appear-active { animation-name: ~"@{keyframeName}In"; animation-play-state: running; } @@ -27,4 +27,4 @@ 80% { transform: translateX(5px); } -} \ No newline at end of file +} diff --git a/style/core/motion/zoom.less b/style/core/motion/zoom.less index 3139bd3891..02783a2745 100644 --- a/style/core/motion/zoom.less +++ b/style/core/motion/zoom.less @@ -1,6 +1,6 @@ .zoom-motion(@className, @keyframeName) { .make-motion(@className, @keyframeName); - .@{className}-enter { + .@{className}-enter, .@{className}-appear { transform: scale(0, 0); // need this by yiminghe animation-timing-function: @ease-out-quint; } -- GitLab