forked from M-Labs/web2019
Remove weird animations from backlog
Signed-off-by: Egor Savkin <es@m-labs.hk>
This commit is contained in:
parent
49e97c6972
commit
0dbd80142d
File diff suppressed because one or more lines are too long
|
@ -10,12 +10,18 @@ import { v4 as uuidv4 } from 'uuid';
|
||||||
|
|
||||||
const data = window.shop_data;
|
const data = window.shop_data;
|
||||||
|
|
||||||
const productStyle = (style, snapshot, removeAnim, hovered, selected) => {
|
const productStyle = (style, snapshot, removeAnim, hovered, selected, cart=false) => {
|
||||||
const custom = {
|
const custom = {
|
||||||
opacity: snapshot.isDragging ? .7 : 1,
|
opacity: snapshot.isDragging ? .7 : 1,
|
||||||
backgroundColor: (hovered || selected) ? '#eae7f7' : 'initial',
|
backgroundColor: (hovered || selected) ? '#eae7f7' : 'initial',
|
||||||
};
|
};
|
||||||
|
|
||||||
|
if (!cart && snapshot.draggingOver == null && // hack for backlog
|
||||||
|
((!snapshot.isDragging) // prevent next elements from animation
|
||||||
|
|| (snapshot.isDragging && snapshot.isDropAnimating))) { // prevent dragged element from weird animation
|
||||||
|
style.transform = "none";
|
||||||
|
}
|
||||||
|
|
||||||
if (!snapshot.isDropAnimating) {
|
if (!snapshot.isDropAnimating) {
|
||||||
return { ...style, ...custom};
|
return { ...style, ...custom};
|
||||||
}
|
}
|
||||||
|
@ -680,6 +686,7 @@ class ProductCartItem extends React.PureComponent {
|
||||||
true,
|
true,
|
||||||
hovered ? true : false,
|
hovered ? true : false,
|
||||||
model.selected ? true : false,
|
model.selected ? true : false,
|
||||||
|
true
|
||||||
)}}
|
)}}
|
||||||
onMouseEnter={this.handleOnMouseEnterRemoveItem.bind(this, index)}
|
onMouseEnter={this.handleOnMouseEnterRemoveItem.bind(this, index)}
|
||||||
onMouseLeave={this.handleOnMouseLeaveRemoveItem.bind(this, index)}
|
onMouseLeave={this.handleOnMouseLeaveRemoveItem.bind(this, index)}
|
||||||
|
@ -1965,6 +1972,7 @@ class Shop extends React.PureComponent {
|
||||||
switch(source.droppableId) {
|
switch(source.droppableId) {
|
||||||
|
|
||||||
case 'backlog':
|
case 'backlog':
|
||||||
|
if (source.droppableId !== destination.droppableId) {
|
||||||
this.setState({
|
this.setState({
|
||||||
...this.state,
|
...this.state,
|
||||||
newCardJustAdded: newAdded ? true : false,
|
newCardJustAdded: newAdded ? true : false,
|
||||||
|
@ -1982,6 +1990,7 @@ class Shop extends React.PureComponent {
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
|
}
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case destination.droppableId:
|
case destination.droppableId:
|
||||||
|
|
|
@ -17,6 +17,8 @@ module.exports = {
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
|
//devtool: "inline-source-map",
|
||||||
|
//mode: "development"
|
||||||
devtool: false,
|
devtool: false,
|
||||||
mode: "production"
|
mode: "production"
|
||||||
};
|
};
|
||||||
|
|
Loading…
Reference in New Issue