Skip to content

Fix uninstantiated bYRotation variable & Lint #18

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

Closed
shaneboyar wants to merge 2 commits into from
Closed

Fix uninstantiated bYRotation variable & Lint #18

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
90682d8
Fix uninstantiated bYRotation variable
shaneboyar Nov 6, 2019
d01a8c7
bump patch version
shaneboyar Nov 6, 2019
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
137 changes: 69 additions & 68 deletions CardFlip.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import React, { Component } from "react";
import PropTypes from "prop-types";
import React, { Component } from 'react';
import PropTypes from 'prop-types';
import { polyfill } from 'react-lifecycles-compat';

import { Platform, StyleSheet, Animated } from "react-native";
import { Platform, StyleSheet, Animated } from 'react-native';

class CardFlip extends Component<Props> {
constructor(props) {
Expand All @@ -14,73 +14,73 @@ class CardFlip extends Component<Props> {
progress: new Animated.Value(0),
rotation: new Animated.ValueXY({ x: 50, y: 50 }),
zoom: new Animated.Value(0),
rotateOrientation: "",
flipDirection: "y"
}
rotateOrientation: '',
flipDirection: 'y',
};
}

static getDerivedStateFromProps(nextProps, prevState) {
if (nextProps.duration !== prevState.duration ||
if (
nextProps.duration !== prevState.duration ||
nextProps.flipZoom !== prevState.flipZoom ||
nextProps.children !== prevState.sides) {
nextProps.children !== prevState.sides
) {
return {
duration: nextProps.duration,
flipZoom: nextProps.flipZoom,
sides: nextProps.children
}
sides: nextProps.children,
};
}
return null;
}


componentDidMount() {
this.setState({
duration: this.props.duration,
flipZoom: this.props.flipZoom,
sides: this.props.children
sides: this.props.children,
});
}


tip(customConfig) {
const defaultConfig = { direction: "left", progress: 0.05, duration: 150 };
const defaultConfig = { direction: 'left', progress: 0.05, duration: 150 };
const config = { ...defaultConfig, ...customConfig };
const { direction, progress, duration } = config;

const { rotation, side } = this.state;
const sequence = [];

if (direction === "right") {
if (direction === 'right') {
sequence.push(
Animated.timing(rotation, {
toValue: {
x: 0,
y: side === 0 ? 50 + progress * 50 : 90
y: side === 0 ? 50 + progress * 50 : 90,
},
duration,
useNativeDriver: true
useNativeDriver: true,
})
);
} else {
sequence.push(
Animated.timing(rotation, {
toValue: {
x: 0,
y: side === 0 ? 50 - progress * 50 : 90
y: side === 0 ? 50 - progress * 50 : 90,
},
duration,
useNativeDriver: true
useNativeDriver: true,
})
);
}
sequence.push(
Animated.timing(rotation, {
toValue: {
x: 0,
y: side === 0 ? 50 : 100
y: side === 0 ? 50 : 100,
},
duration,
useNativeDriver: true
useNativeDriver: true,
})
);
Animated.sequence(sequence).start();
Expand All @@ -100,39 +100,39 @@ class CardFlip extends Component<Props> {
Animated.timing(rotation, {
toValue: {
x: 0,
y: side === 0 ? 50 + progress * 50 : 90
y: side === 0 ? 50 + progress * 50 : 90,
},
duration,
useNativeDriver: true
useNativeDriver: true,
})
);

sequence.push(
Animated.timing(rotation, {
toValue: {
x: 0,
y: side === 0 ? 50 - progress * 50 : 110
y: side === 0 ? 50 - progress * 50 : 110,
},
duration,
useNativeDriver: true
useNativeDriver: true,
})
);
}
sequence.push(
Animated.timing(rotation, {
toValue: {
x: 0,
y: side === 0 ? 50 : 100
y: side === 0 ? 50 : 100,
},
duration,
useNativeDriver: true
useNativeDriver: true,
})
);
Animated.sequence(sequence).start();
}

flip() {
if (this.props.flipDirection == "y") {
if (this.props.flipDirection == 'y') {
this.flipY();
} else {
this.flipX();
Expand All @@ -143,22 +143,22 @@ class CardFlip extends Component<Props> {
const { side } = this.state;
this._flipTo({
x: 50,
y: side === 0 ? 100 : 50
y: side === 0 ? 100 : 50,
});
this.setState({
side: side === 0 ? 1 : 0,
rotateOrientation: "y"
rotateOrientation: 'y',
});
}

flipX() {
const { side } = this.state;
this._flipTo({
y: 50,
x: side === 0 ? 100 : 50
x: side === 0 ? 100 : 50,
});
this.setState({
side: (side === 0) ? 1 : 0,
side: side === 0 ? 1 : 0,
rotateOrientation: 'x',
});
}
Expand All @@ -171,25 +171,25 @@ class CardFlip extends Component<Props> {
Animated.timing(progress, {
toValue: side === 0 ? 100 : 0,
duration,
useNativeDriver: true
useNativeDriver: true,
}),
Animated.sequence([
Animated.timing(zoom, {
toValue: 100,
duration: duration / 2,
useNativeDriver: true
useNativeDriver: true,
}),
Animated.timing(zoom, {
toValue: 0,
duration: duration / 2,
useNativeDriver: true
})
useNativeDriver: true,
}),
]),
Animated.timing(rotation, {
toValue,
duration: duration,
useNativeDriver: true
})
useNativeDriver: true,
}),
]).start(() => {
this.props.onFlipEnd(side === 0 ? 1 : 0);
});
Expand All @@ -202,27 +202,27 @@ class CardFlip extends Component<Props> {
const sideAOpacity = progress.interpolate({
inputRange: [50, 51],
outputRange: [100, 0],
extrapolate: "clamp"
extrapolate: 'clamp',
});

const sideATransform = {
opacity: sideAOpacity,
zIndex: side === 0 ? 1 : 0,
transform: [{ perspective: this.props.perspective }]
transform: [{ perspective: this.props.perspective }],
};
if (rotateOrientation === "x") {
if (rotateOrientation === 'x') {
const aXRotation = rotation.x.interpolate({
inputRange: [0, 50, 100, 150],
outputRange: ["-180deg", "0deg", "180deg", "0deg"],
extrapolate: "clamp"
outputRange: ['-180deg', '0deg', '180deg', '0deg'],
extrapolate: 'clamp',
});
sideATransform.transform.push({ rotateX: aXRotation });
} else {
// cardA Y-rotation
const aYRotation = rotation.y.interpolate({
inputRange: [0, 50, 100, 150],
outputRange: ["-180deg", "0deg", "180deg", "0deg"],
extrapolate: "clamp"
outputRange: ['-180deg', '0deg', '180deg', '0deg'],
extrapolate: 'clamp',
});
sideATransform.transform.push({ rotateY: aYRotation });
}
Expand All @@ -235,36 +235,37 @@ class CardFlip extends Component<Props> {
const sideBOpacity = progress.interpolate({
inputRange: [50, 51],
outputRange: [0, 100],
extrapolate: "clamp"
extrapolate: 'clamp',
});

const sideBTransform = {
opacity: sideBOpacity,
zIndex: side === 0 ? 0 : 1,
transform: [{ perspective: -1 * this.props.perspective }]
transform: [{ perspective: -1 * this.props.perspective }],
};

if (rotateOrientation === "x") {
if (rotateOrientation === 'x') {
const bXRotation = rotation.x.interpolate({
inputRange: [0, 50, 100, 150],
outputRange: ["0deg", "-180deg", "-360deg", "180deg"],
extrapolate: "clamp"
outputRange: ['0deg', '-180deg', '-360deg', '180deg'],
extrapolate: 'clamp',
});
sideBTransform.transform.push({ rotateX: bXRotation });
} else {
if (Platform.OS === "ios") {
let bYRotation;
Copy link
Copy Markdown

@ichko ichko Nov 12, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe this can be done with ternary operator?

Copy link
Copy Markdown
Author

@shaneboyar shaneboyar Nov 16, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Definitely. There's probably some other refactoring that can be done as well, but I was just hoping to get this bug quickly fixed in this PR.

if (Platform.OS === 'ios') {
// cardB Y-rotation
bYRotation = rotation.y.interpolate({
inputRange: [0, 50, 100, 150],
outputRange: ["0deg", "180deg", "0deg", "-180deg"],
extrapolate: "clamp"
outputRange: ['0deg', '180deg', '0deg', '-180deg'],
extrapolate: 'clamp',
});
} else {
// cardB Y-rotation
bYRotation = rotation.y.interpolate({
inputRange: [0, 50, 100, 150],
outputRange: ["0deg", "-180deg", "0deg", "180deg"],
extrapolate: "clamp"
outputRange: ['0deg', '-180deg', '0deg', '180deg'],
extrapolate: 'clamp',
});
}
sideBTransform.transform.push({ rotateY: bYRotation });
Expand All @@ -286,11 +287,11 @@ class CardFlip extends Component<Props> {
const cardZoom = zoom.interpolate({
inputRange: [0, 100],
outputRange: [1, 1 + flipZoom],
extrapolate: "clamp"
extrapolate: 'clamp',
});

const scaling = {
transform: [{ scale: cardZoom }]
transform: [{ scale: cardZoom }],
};

return (
Expand All @@ -308,39 +309,39 @@ class CardFlip extends Component<Props> {
const styles = StyleSheet.create({
cardContainer: {
flex: 1,
position: "absolute",
position: 'absolute',
left: 0,
right: 0,
bottom: 0,
top: 0
}
top: 0,
},
});

CardFlip.defaultProps = {
style: {},
duration: 500,
flipZoom: 0.09,
flipDirection: "y",
flipDirection: 'y',
perspective: 800,
onFlip: () => { },
onFlipStart: () => { },
onFlipEnd: () => { }
onFlip: () => {},
onFlipStart: () => {},
onFlipEnd: () => {},
};

CardFlip.propTypes = {
style: PropTypes.oneOfType([
PropTypes.number,
PropTypes.object,
PropTypes.array
PropTypes.array,
]),
duration: PropTypes.number,
flipZoom: PropTypes.number,
flipDirection: PropTypes.string,
onFlip: PropTypes.func,
onFlipEnd: PropTypes.func,
onFlipStart: PropTypes.func,
perspective: PropTypes.number
perspective: PropTypes.number,
};

polyfill(CardFlip)
export default CardFlip
polyfill(CardFlip);
export default CardFlip;
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "react-native-card-flip",
"version": "1.0.6",
"version": "1.0.7",
"description": "Card flip animation for React Native",
"main": "index.js",
"scripts": {
Expand Down