Skip to content

Fix CardB's components to work while its on top of the Card Stack #38

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

Open
nevaehph wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Fix CardB's components to work while its on top of the Card Stack #38

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a8a35fd
Updated to allow Touchables to work on CardB as well
nevaehph Nov 30, 2018
d5fa52d
Revert "Updated to allow Touchables to work on CardB as well"
nevaehph Nov 30, 2018
2cc7558
Allow CardB's Touchables to be selectable as well
nevaehph Nov 30, 2018
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
141 changes: 101 additions & 40 deletions CardStack.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -370,6 +370,105 @@ export default class CardStack extends Component {
}


renderTop(drag, cardA, cardB, topCard, SC, rotate) {
if(topCard == "cardB"){
return (
<Animated.View style={{
position: 'absolute',
...Platform.select({
ios: {
zIndex: (topCard === 'cardB') ? 3 : 2,
},
android: {
elevation: (topCard === 'cardB') ? 3 : 2,
}
}),
transform: [
{ rotate: (topCard === 'cardB') ? rotate: '0deg' },
{translateX: (topCard === 'cardB') ? drag.x: 0},
{translateY: (topCard === 'cardB') ? drag.y: 0},
{ scale: (topCard === 'cardB') ? 1 : SC},
]
}}>
{cardB}
</Animated.View>
);
}
else{
return (
<Animated.View style={{
position: 'absolute',
...Platform.select({
ios: {
zIndex: (topCard === 'cardA') ? 3 : 2,
},
android: {
elevation: (topCard === 'cardA') ? 3 : 2,
}
}),
transform: [
{ rotate: (topCard === 'cardA') ? rotate: '0deg' },
{translateX: (topCard === 'cardA') ? drag.x: 0},
{translateY: (topCard === 'cardA') ? drag.y: 0},
{ scale: (topCard === 'cardA') ? 1 : SC},
]
}}>
{cardA}
</Animated.View>
)
}
}

renderBottom(drag, cardA, cardB, topCard, SC, rotate) {
if(topCard == "cardA"){
return (
<Animated.View style={{
position: 'absolute',
...Platform.select({
ios: {
zIndex: (topCard === 'cardB') ? 3 : 2,
},
android: {
elevation: (topCard === 'cardB') ? 3 : 2,
}
}),
transform: [
{ rotate: (topCard === 'cardB') ? rotate: '0deg' },
{translateX: (topCard === 'cardB') ? drag.x: 0},
{translateY: (topCard === 'cardB') ? drag.y: 0},
{ scale: (topCard === 'cardB') ? 1 : SC},
]
}}>
{cardB}
</Animated.View>
);
}
else{
return (
<Animated.View style={{
position: 'absolute',
...Platform.select({
ios: {
zIndex: (topCard === 'cardA') ? 3 : 2,
},
android: {
elevation: (topCard === 'cardA') ? 3 : 2,
}
}),
transform: [
{ rotate: (topCard === 'cardA') ? rotate: '0deg' },
{translateX: (topCard === 'cardA') ? drag.x: 0},
{translateY: (topCard === 'cardA') ? drag.y: 0},
{ scale: (topCard === 'cardA') ? 1 : SC},
]
}}>
{cardA}
</Animated.View>
)
}
}


render() {

const { secondCardZoom } = this.props;
Expand All @@ -385,48 +484,10 @@ export default class CardStack extends Component {
outputRange: this.props.outputRotationRange,
extrapolate: 'clamp',
});

return (
<View {...this._panResponder.panHandlers} style={[{position:'relative'},this.props.style]}>
<Animated.View style={{
position: 'absolute',
...Platform.select({
ios: {
zIndex: (topCard === 'cardB') ? 3 : 2,
},
android: {
elevation: (topCard === 'cardB') ? 3 : 2,
}
}),
transform: [
{ rotate: (topCard === 'cardB') ? rotate: '0deg' },
{translateX: (topCard === 'cardB') ? drag.x: 0},
{translateY: (topCard === 'cardB') ? drag.y: 0},
{ scale: (topCard === 'cardB') ? 1 : SC},
]
}}>
{cardB}
</Animated.View>
<Animated.View style={{
position: 'absolute',
...Platform.select({
ios: {
zIndex: (topCard === 'cardA') ? 3 : 2,
},
android: {
elevation: (topCard === 'cardA') ? 3 : 2,
}
}),
transform: [
{ rotate: (topCard === 'cardA') ? rotate: '0deg' },
{translateX: (topCard === 'cardA') ? drag.x: 0},
{translateY: (topCard === 'cardA') ? drag.y: 0},
{ scale: (topCard === 'cardA') ? 1 : SC},
]
}}>
{cardA}
</Animated.View>

{this.renderBottom(drag, cardA, cardB, topCard, SC, rotate)}
{this.renderTop(drag, cardA, cardB, topCard, SC, rotate)}
{this.props.renderNoMoreCards()}

</View>
Expand Down