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

fix: Patch AnimatedStyle to avoid discarding the initial style info #35198

Closed
wants to merge 8 commits into from
Closed

fix: Patch AnimatedStyle to avoid discarding the initial style info #35198

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
8172721
fix: Patch AnimatedStyle to avoid discarding the initial style info
gabrieldonadel Nov 4, 2022
8d4717e
chore: Update AnimatedStyle __getValue to return an array of objects
gabrieldonadel Nov 8, 2022
986a0c2
chore: Fix unit tests
gabrieldonadel Nov 8, 2022
b45837a
chore: Add Platform.OS check to AnimatedStyle
gabrieldonadel Nov 8, 2022
45e8c02
chore: Update AnimatedStyle and Animated tests
gabrieldonadel Nov 11, 2022
5b6fede
chore: Remove unnecessary mock from test
gabrieldonadel Nov 16, 2022
650c45e
chore: Update Animated web tests
gabrieldonadel Nov 17, 2022
11daeda
chore: Update AnimatedStyle constructor
gabrieldonadel Nov 17, 2022
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
129 changes: 75 additions & 54 deletions Libraries/Animated/__tests__/Animated-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,15 +62,17 @@ describe('Animated tests', () => {
);

expect(node.__getValue()).toEqual({
style: {
backgroundColor: 'red',
opacity: 0,
transform: [{translate: [100, 100]}, {translateX: 100}, {scale: 0}],
shadowOffset: {
width: 0,
height: 0,
style: [
{
backgroundColor: 'red',
opacity: 0,
transform: [{translate: [100, 100]}, {translateX: 100}, {scale: 0}],
shadowOffset: {
width: 0,
height: 0,
},
},
},
],
});

expect(anim.__getChildren().length).toBe(0);
Expand All @@ -84,15 +86,21 @@ describe('Animated tests', () => {
expect(callback).toBeCalled();

expect(node.__getValue()).toEqual({
style: {
backgroundColor: 'red',
opacity: 0.5,
transform: [{translate: [150, 150]}, {translateX: 150}, {scale: 0.5}],
shadowOffset: {
width: 0.5,
height: 0.5,
style: [
{
backgroundColor: 'red',
opacity: 0.5,
transform: [
{translate: [150, 150]},
{translateX: 150},
{scale: 0.5},
],
shadowOffset: {
width: 0.5,
height: 0.5,
},
},
},
],
});

node.__detach();
Expand Down Expand Up @@ -173,15 +181,15 @@ describe('Animated tests', () => {
<Animated.View style={{opacity}} />,
);

expect(testRenderer.toJSON().props.style.opacity).toEqual(0);
expect(testRenderer.toJSON().props.style[0].opacity).toEqual(0);

Animated.timing(opacity, {
toValue: 1,
duration: 0,
useNativeDriver: false,
}).start();

expect(testRenderer.toJSON().props.style.opacity).toEqual(1);
expect(testRenderer.toJSON().props.style[0].opacity).toEqual(1);
});

it('warns if `useNativeDriver` is missing', () => {
Expand Down Expand Up @@ -804,30 +812,34 @@ describe('Animated tests', () => {
describe('Animated Vectors', () => {
it('should animate vectors', () => {
const vec = new Animated.ValueXY();
const vecLayout = vec.getLayout();
const opacity = vec.x.interpolate({
inputRange: [0, 42],
outputRange: [0.2, 0.8],
});

const callback = jest.fn();

const node = new AnimatedProps(
{
style: {
opacity: vec.x.interpolate({
inputRange: [0, 42],
outputRange: [0.2, 0.8],
}),
opacity,
transform: vec.getTranslateTransform(),
...vec.getLayout(),
...vecLayout,
},
},
callback,
);

expect(node.__getValue()).toEqual({
style: {
opacity: 0.2,
transform: [{translateX: 0}, {translateY: 0}],
left: 0,
top: 0,
},
style: [
{
opacity: 0.2,
transform: [{translateX: 0}, {translateY: 0}],
left: 0,
top: 0,
},
],
});

node.__attach();
Expand All @@ -839,12 +851,14 @@ describe('Animated tests', () => {
expect(callback.mock.calls.length).toBe(2); // once each for x, y

expect(node.__getValue()).toEqual({
style: {
opacity: 0.8,
transform: [{translateX: 42}, {translateY: 1492}],
left: 42,
top: 1492,
},
style: [
{
opacity: 0.8,
transform: [{translateX: 42}, {translateY: 1492}],
left: 42,
top: 1492,
},
],
});

node.__detach();
Expand Down Expand Up @@ -937,13 +951,15 @@ describe('Animated tests', () => {
expect(listener.mock.calls.length).toBe(2);
expect(listener).toBeCalledWith({value: 137});
expect(view.__getValue()).toEqual({
style: {
transform: [
{
translateX: 137,
},
],
},
style: [
{
transform: [
{
translateX: 137,
},
],
},
],
});
value4.removeListener(id);
value1.setValue(40);
Expand Down Expand Up @@ -1011,17 +1027,18 @@ describe('Animated tests', () => {

it('should animate colors', () => {
const color = new Animated.Color({r: 255, g: 0, b: 0, a: 1.0});
const scale = color.a.interpolate({
inputRange: [0, 1],
outputRange: [1, 2],
});
const callback = jest.fn();
const node = new AnimatedProps(
{
style: {
backgroundColor: color,
transform: [
{
scale: color.a.interpolate({
inputRange: [0, 1],
outputRange: [1, 2],
}),
scale,
},
],
},
Expand All @@ -1030,10 +1047,12 @@ describe('Animated tests', () => {
);

expect(node.__getValue()).toEqual({
style: {
backgroundColor: 'rgba(255, 0, 0, 1)',
transform: [{scale: 2}],
},
style: [
{
backgroundColor: 'rgba(255, 0, 0, 1)',
transform: [{scale: 2}],
},
],
});

node.__attach();
Expand All @@ -1042,10 +1061,12 @@ describe('Animated tests', () => {
color.setValue({r: 11, g: 22, b: 33, a: 0.5});
expect(callback.mock.calls.length).toBe(4);
expect(node.__getValue()).toEqual({
style: {
backgroundColor: 'rgba(11, 22, 33, 0.5)',
transform: [{scale: 1.5}],
},
style: [
{
backgroundColor: 'rgba(11, 22, 33, 0.5)',
transform: [{scale: 1.5}],
},
],
});

node.__detach();
Expand Down
Loading