Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Web LA] Fill in missing keyframes in default animations #6259

Merged
merged 8 commits into from
Jul 11, 2024
Merged

[Web LA] Fill in missing keyframes in default animations #6259

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
4cbbc1d
Bounce
m-bert Jul 11, 2024
69d5a79
Fade
m-bert Jul 11, 2024
82efa47
Fix fade directions
m-bert Jul 11, 2024
767d641
Lightspeed
m-bert Jul 11, 2024
d0e6c04
Pinwheeel
m-bert Jul 11, 2024
3541a5e
Roll
m-bert Jul 11, 2024
e91954c
Rotate
m-bert Jul 11, 2024
a171e9b
Zoom
m-bert Jul 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions packages/react-native-reanimated/src/layoutReanimation/web/animation/Bounce.web.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@ export const BounceOutData = {
BounceOut: {
name: 'BounceOut',
style: {
0: { transform: [{ scale: 1 }] },
15: { transform: [{ scale: 1.1 }] },
30: { transform: [{ scale: 0.9 }] },
45: { transform: [{ scale: 1.2 }] },
Expand All @@ -80,6 +81,7 @@ export const BounceOutData = {
BounceOutRight: {
name: 'BounceOutRight',
style: {
0: { transform: [{ translateX: '0px' }] },
15: { transform: [{ translateX: '-10px' }] },
30: { transform: [{ translateX: '10px' }] },
45: { transform: [{ translateX: '-20px' }] },
Expand All @@ -91,6 +93,7 @@ export const BounceOutData = {
BounceOutLeft: {
name: 'BounceOutLeft',
style: {
0: { transform: [{ translateX: '0px' }] },
15: { transform: [{ translateX: '10px' }] },
30: { transform: [{ translateX: '-10px' }] },
45: { transform: [{ translateX: '20px' }] },
Expand All @@ -102,6 +105,7 @@ export const BounceOutData = {
BounceOutUp: {
name: 'BounceOutUp',
style: {
0: { transform: [{ translateY: '0px' }] },
15: { transform: [{ translateY: '10px' }] },
30: { transform: [{ translateY: '-10px' }] },
45: { transform: [{ translateY: '20px' }] },
Expand All @@ -113,6 +117,7 @@ export const BounceOutData = {
BounceOutDown: {
name: 'BounceOutDown',
style: {
0: { transform: [{ translateY: '0px' }] },
15: { transform: [{ translateY: '-10px' }] },
30: { transform: [{ translateY: '10px' }] },
45: { transform: [{ translateY: '-20px' }] },
Expand Down
42 changes: 40 additions & 2 deletions packages/react-native-reanimated/src/layoutReanimation/web/animation/Fade.web.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,10 @@ const DEFAULT_FADE_TIME = 0.3;
export const FadeInData = {
FadeIn: {
name: 'FadeIn',
style: { 0: { opacity: 0 } },
style: {
0: { opacity: 0 },
100: { opacity: 1 },
},
duration: DEFAULT_FADE_TIME,
},

Expand All @@ -17,6 +20,10 @@ export const FadeInData = {
opacity: 0,
transform: [{ translateX: '25px' }],
},
100: {
opacity: 1,
transform: [{ translateX: '0px' }],
},
},
duration: DEFAULT_FADE_TIME,
},
Expand All @@ -28,6 +35,10 @@ export const FadeInData = {
opacity: 0,
transform: [{ translateX: '-25px' }],
},
100: {
opacity: 1,
transform: [{ translateX: '0px' }],
},
},
duration: DEFAULT_FADE_TIME,
},
Expand All @@ -39,6 +50,10 @@ export const FadeInData = {
opacity: 0,
transform: [{ translateY: '-25px' }],
},
100: {
opacity: 1,
transform: [{ translateY: '0px' }],
},
},
duration: DEFAULT_FADE_TIME,
},
Expand All @@ -50,6 +65,10 @@ export const FadeInData = {
opacity: 0,
transform: [{ translateY: '25px' }],
},
100: {
opacity: 1,
transform: [{ translateY: '0px' }],
},
},
duration: DEFAULT_FADE_TIME,
},
Expand All @@ -58,13 +77,20 @@ export const FadeInData = {
export const FadeOutData = {
FadeOut: {
name: 'FadeOut',
style: { 100: { opacity: 0 } },
style: {
0: { opacity: 1 },
100: { opacity: 0 },
},
duration: DEFAULT_FADE_TIME,
},

FadeOutRight: {
name: 'FadeOutRight',
style: {
0: {
opacity: 1,
transform: [{ translateX: '0px' }],
},
100: {
opacity: 0,
transform: [{ translateX: '25px' }],
Expand All @@ -76,6 +102,10 @@ export const FadeOutData = {
FadeOutLeft: {
name: 'FadeOutLeft',
style: {
0: {
opacity: 1,
transform: [{ translateX: '0px' }],
},
100: {
opacity: 0,
transform: [{ translateX: '-25px' }],
Expand All @@ -87,6 +117,10 @@ export const FadeOutData = {
FadeOutUp: {
name: 'FadeOutUp',
style: {
0: {
opacity: 1,
transform: [{ translateY: '0px' }],
},
100: {
opacity: 0,
transform: [{ translateY: '-25px' }],
Expand All @@ -98,6 +132,10 @@ export const FadeOutData = {
FadeOutDown: {
name: 'FadeOutDown',
style: {
0: {
opacity: 1,
transform: [{ translateY: '0px' }],
},
100: {
opacity: 0,
transform: [{ translateY: '25px' }],
Expand Down
8 changes: 8 additions & 0 deletions packages/react-native-reanimated/src/layoutReanimation/web/animation/Lightspeed.web.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,10 @@ export const LightSpeedOutData = {
LightSpeedOutRight: {
name: 'LightSpeedOutRight',
style: {
0: {
transform: [{ translateX: '0vw', skewX: '0deg' }],
opacity: 1,
},
100: {
transform: [{ translateX: '100vw', skewX: '-45deg' }],
opacity: 0,
Expand All @@ -48,6 +52,10 @@ export const LightSpeedOutData = {
LightSpeedOutLeft: {
name: 'LightSpeedOutLeft',
style: {
0: {
transform: [{ translateX: '0vw', skew: '0deg' }],
opacity: 1,
},
100: {
transform: [{ translateX: '-100vw', skew: '45deg' }],
opacity: 0,
Expand Down
4 changes: 4 additions & 0 deletions packages/react-native-reanimated/src/layoutReanimation/web/animation/Pinwheel.web.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,10 @@ export const PinwheelData = {
PinwheelOut: {
name: 'PinwheelOut',
style: {
0: {
transform: [{ rotate: '0rad', scale: 1 }],
opacity: 1,
},
100: {
transform: [{ rotate: '5rad', scale: 0 }],
opacity: 0,
Expand Down
12 changes: 12 additions & 0 deletions packages/react-native-reanimated/src/layoutReanimation/web/animation/Roll.web.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@ export const RollInData = {
0: {
transform: [{ translateX: '-100vw', rotate: '-180deg' }],
},
100: {
transform: [{ translateX: '0vw', rotate: '0deg' }],
},
},
duration: DEFAULT_ROLL_TIME,
},
Expand All @@ -20,6 +23,9 @@ export const RollInData = {
0: {
transform: [{ translateX: '100vw', rotate: '180deg' }],
},
100: {
transform: [{ translateX: '0vw', rotate: '0deg' }],
},
},
duration: DEFAULT_ROLL_TIME,
},
Expand All @@ -29,6 +35,9 @@ export const RollOutData = {
RollOutLeft: {
name: 'RollOutLeft',
style: {
0: {
transform: [{ translateX: '0vw', rotate: '0deg' }],
},
100: {
transform: [{ translateX: '-100vw', rotate: '-180deg' }],
},
Expand All @@ -39,6 +48,9 @@ export const RollOutData = {
RollOutRight: {
name: 'RollOutRight',
style: {
0: {
transform: [{ translateX: '0vw', rotate: '0deg' }],
},
100: {
transform: [{ translateX: '100vw', rotate: '180deg' }],
},
Expand Down
80 changes: 80 additions & 0 deletions packages/react-native-reanimated/src/layoutReanimation/web/animation/Rotate.web.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,16 @@ export const RotateInData = {
],
opacity: 0,
},
100: {
transform: [
{
translateX: '0%',
translateY: '0%',
rotate: '0deg',
},
],
opacity: 1,
},
},
duration: DEFAULT_ROTATE_TIME,
},
Expand All @@ -34,6 +44,16 @@ export const RotateInData = {
],
opacity: 0,
},
100: {
transform: [
{
translateX: '0%',
translateY: '0%',
rotate: '0deg',
},
],
opacity: 1,
},
},
duration: DEFAULT_ROTATE_TIME,
},
Expand All @@ -51,6 +71,16 @@ export const RotateInData = {
],
opacity: 0,
},
100: {
transform: [
{
translateX: '0%',
translateY: '0%',
rotate: '0deg',
},
],
opacity: 1,
},
},
duration: DEFAULT_ROTATE_TIME,
},
Expand All @@ -68,6 +98,16 @@ export const RotateInData = {
],
opacity: 0,
},
100: {
transform: [
{
translateX: '0%',
translateY: '0%',
rotate: '0deg',
},
],
opacity: 1,
},
},
duration: DEFAULT_ROTATE_TIME,
},
Expand All @@ -77,6 +117,16 @@ export const RotateOutData = {
RotateOutDownLeft: {
name: 'RotateOutDownLeft',
style: {
0: {
transform: [
{
translateX: '0%',
translateY: '0%',
rotate: '0deg',
},
],
opacity: 1,
},
100: {
transform: [
{
Expand All @@ -94,6 +144,16 @@ export const RotateOutData = {
RotateOutDownRight: {
name: 'RotateOutDownRight',
style: {
0: {
transform: [
{
translateX: '0%',
translateY: '0%',
rotate: '0deg',
},
],
opacity: 1,
},
100: {
transform: [
{
Expand All @@ -111,6 +171,16 @@ export const RotateOutData = {
RotateOutUpLeft: {
name: 'RotateOutUpLeft',
style: {
0: {
transform: [
{
translateX: '0%',
translateY: '0%',
rotate: '0deg',
},
],
opacity: 1,
},
100: {
transform: [
{
Expand All @@ -128,6 +198,16 @@ export const RotateOutData = {
RotateOutUpRight: {
name: 'RotateOutUpRight',
style: {
0: {
transform: [
{
translateX: '0%',
translateY: '0%',
rotate: '0deg',
},
],
opacity: 1,
},
100: {
transform: [
{
Expand Down
Loading
Loading