Animate cancel #30
Merged
Animate cancel #30
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
alexreardon
force-pushed
the
animate-cancel
branch
2 times, most recently
from
4f65507 to
93b8a2e
Compare
alexreardon
commented
Aug 15, 2017
| export type CancelAction = { | ||
| type: 'CANCEL', | ||
| payload: DraggableId | ||
| type CleanAction = { |
There was a problem hiding this comment.
Separating out 'clean' from 'cancel'. Clean is driven by errors, cancel is driven by the user
| @@ -156,22 +159,33 @@ export const makeSelector = () => { | |||
| return defaultMapProps; | |||
| } | |||
|
|
|||
| if (pending.last.current.id !== id) { | |||
| if (pending.result.draggableId !== id) { | |||
| // This flag is a matter of degree. | |||
There was a problem hiding this comment.
A little rough edge that try to balance correctness with an a constantly interactive application
| @@ -81,7 +81,7 @@ export type DispatchProps = { | |||
| export type MapProps = {| | |||
| isDragging: boolean, | |||
| isDropAnimating: boolean, | |||
| isAnotherDragging: boolean, | |||
| canLift: boolean, | |||
| ): NotDraggingStyle => { | ||
| const style: NotDraggingStyle = { | ||
| transition: canAnimate ? css.outOfTheWay : null, | ||
| transform: movementStyle.transform, | ||
| pointerEvents: isAnotherDragging ? 'none' : 'auto', | ||
| pointerEvents: canLift ? 'auto' : 'none', |
There was a problem hiding this comment.
now this reads really naturally
| @@ -11,6 +11,7 @@ export default class Placeholder extends PureComponent { | |||
| const style = { | |||
| width: this.props.width, | |||
| height: this.props.height, | |||
| pointerEvents: 'none', | |||
There was a problem hiding this comment.
a little optimisation
| @@ -507,6 +681,97 @@ describe('Draggable - connected', () => { | |||
| }); | |||
| }); | |||
|
|
|||
| describe('selector isolation', () => { | |||
There was a problem hiding this comment.
being super paranoid
| makeMapStateToProps(), | ||
| // returning a function to ensure each | ||
| // Draggable gets its own selector | ||
| makeMapStateToProps, |
There was a problem hiding this comment.
This was previously an error that caused needless memoization cache busts in certain circumstances. Now returning a function that returns selectors to ensure that each component gets its own selector
|
Here is the new behaviour in action:
|
alexreardon
force-pushed
the
animate-cancel
branch
from
93b8a2e to
b8d37b6
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Currently drag 'cancel' actions are not animated. This behaviour was accounted for a one point before this library was public. It must have regressed when I made some serious changes to draggable and drag handle around animations and pointer events
This PR also improves a few minor performance issues
user-select: noneon placeholder