Skip to content

Commit c6139f5

Browse files
committed
fix(Dialog): update dialog motion
1 parent 364ed28 commit c6139f5

File tree

7 files changed

+13
-8
lines changed

7 files changed

+13
-8
lines changed

src/animate/scss/_fading-entrances/_fadeInUp.scss

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
@include keyframes(fadeInUp) {
22
0% {
33
opacity: 0;
4-
@include transform(translateY(20px));}
4+
@include transform(translateY(24px));}
55
100% {
66
opacity: 1;
77
@include transform(translateY(0));
88
}
99
}
1010

11-
@mixin fadeInUp($count: $countDefault, $duration: $durationDefault, $delay: $delayDefault, $function: $ease-out-quint, $fill: $fillDefault, $visibility: $visibilityDefault) {
11+
@mixin fadeInUp($count: $countDefault, $duration: $motion-duration-standard-in, $delay: $delayDefault, $function: $motion-default, $fill: $fillDefault, $visibility: $visibilityDefault) {
1212
@include animation-name(fadeInUp);
1313
@include count($count);
1414
@include duration($duration);

src/animate/scss/_fading-exits/_fadeOutUp.scss

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@
55
}
66
100% {
77
opacity: 0;
8-
@include transform(translateY(-100px));
8+
@include transform(translateY(-24px));
99
}
1010
}
1111

12-
@mixin fadeOutUp($count: $countDefault, $duration: .2s, $delay: $delayDefault, $function: $ease-in-quint, $fill: $fillDefault, $visibility: $visibilityDefault) {
12+
@mixin fadeOutUp($count: $countDefault, $duration: $motion-duration-standard-out, $delay: $delayDefault, $function: $motion-default, $fill: $fillDefault, $visibility: $visibilityDefault) {
1313
@include animation-name(fadeOutUp);
1414
@include count($count);
1515
@include duration($duration);

src/animate/scss/variable.scss

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
@charset "UTF-8";
2+
@import "../../core/style/_motion.scss";
23

34
// animate variables
45
// --------------------------------------------------

src/core/style/_motion.scss

+6
Original file line numberDiff line numberDiff line change
@@ -9,3 +9,9 @@ $motion-duration-immediately: 100ms;
99
$motion-duration-standard: 300ms;
1010
$motion-duration-complex: 450ms;
1111
$motion-duration-continue: 600ms;
12+
13+
$motion-default: cubic-bezier(.4, 0, .2, 1);
14+
// 进入类动画默认时长300ms
15+
$motion-duration-standard-in: 300ms;
16+
// 消失类动画默认时长250ms
17+
$motion-duration-standard-out: 250ms;

src/dialog/dialog.jsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ export default class Dialog extends Component {
173173
afterClose: noop,
174174
hasMask: true,
175175
animation: {
176-
in: 'fadeInDown',
176+
in: 'fadeInUp',
177177
out: 'fadeOutUp',
178178
},
179179
autoFocus: false,

src/dialog/main.scss

-2
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,6 @@
1212
box-shadow: $dialog-shadow;
1313
text-align: left;
1414
overflow: hidden;
15-
animation-duration: $motion-duration-standard;
16-
animation-timing-function: $motion-ease-in-out;
1715
max-width: 90%;
1816

1917
&-header {

src/overlay/main.scss

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
width: 100%;
1515
height: 100%;
1616
background-color: $color-calculate-mask-background;
17-
transition: opacity $motion-duration-standard $motion-ease;
17+
transition: opacity $motion-duration-standard $motion-default;
1818
opacity: 0;
1919
}
2020

0 commit comments

Comments
 (0)