Skip to content

Commit f17a73b

Browse files
authored
Merge pull request 8base#318 from lesha1201/loader_fix
fix(Loader): sometimes fadeOut starts earlier
2 parents 689b33c + c1f316d commit f17a73b

File tree

1 file changed

+9
-14
lines changed

1 file changed

+9
-14
lines changed

src/components/Loader/Loader.theme.js

Lines changed: 9 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -6,27 +6,23 @@ import { createThemeTag } from '../../theme/createThemeTag';
66

77
const name = 'loader';
88

9-
const fadeOut = keyframes`
10-
0% {
11-
opacity: 1;
12-
}
13-
100% {
14-
opacity: 0;
15-
}
16-
`;
17-
18-
const sizeIn = keyframes`
9+
const pulse = keyframes`
1910
0% {
2011
width: 0;
2112
height: 0;
13+
opacity: 1;
14+
}
15+
45% {
16+
opacity: 0.6;
2217
}
2318
100% {
2419
width: 100%;
2520
height: 100%;
21+
opacity: 0;
2622
}
2723
`;
2824

29-
const [LoaderTag, themeLoader] = createThemeTag(name, ({ COLORS }: *) => ({
25+
const [LoaderTag, themeLoader] = createThemeTag(name, {
3026
root: {
3127
display: 'inline-flex',
3228
position: 'relative',
@@ -46,9 +42,8 @@ const [LoaderTag, themeLoader] = createThemeTag(name, ({ COLORS }: *) => ({
4642
height: '80px',
4743
},
4844
},
49-
color: fp.mapValues(color => ({ color }), COLORS),
5045
},
51-
}));
46+
});
5247

5348
const [LoaderCircleTag, themeLoaderCircle] = createThemeTag(`${name}Circle`, ({ COLORS }: *) => ({
5449
root: ({ delay }) => ({
@@ -60,7 +55,7 @@ const [LoaderCircleTag, themeLoaderCircle] = createThemeTag(`${name}Circle`, ({
6055
top: '50%',
6156
opacity: '0',
6257

63-
animation: `${fadeOut} 1.8s cubic-bezier(0.3, 0.61, 0.355, 1) ${delay}, ${sizeIn} 1.8s cubic-bezier(0.165, 0.84, 0.44, 1) ${delay}`,
58+
animation: `${pulse} 1.8s cubic-bezier(0.165, 0.84, 0.44, 1) ${delay}`,
6459
animationIterationCount: 'infinite',
6560
}),
6661
modifiers: {

0 commit comments

Comments
 (0)