react-pannable
Advanced tools
Comparing version 6.1.9 to 6.1.10
@@ -121,9 +121,9 @@ "use strict"; | ||
} else { | ||
if (state.pannable.cancelled) { | ||
if (state.pannable.ended) { | ||
dispatch({ | ||
type: 'dragCancel' | ||
type: 'dragEnd' | ||
}); | ||
} else { | ||
dispatch({ | ||
type: 'dragEnd' | ||
type: 'dragCancel' | ||
}); | ||
@@ -130,0 +130,0 @@ } |
@@ -77,10 +77,10 @@ "use strict"; | ||
if (state.cancelled) { | ||
if (state.ended) { | ||
if (onEnd) { | ||
onEnd(evt); | ||
} | ||
} else { | ||
if (onCancel) { | ||
onCancel(evt); | ||
} | ||
} else { | ||
if (onEnd) { | ||
onEnd(evt); | ||
} | ||
} | ||
@@ -97,10 +97,10 @@ } | ||
if (state.cancelled) { | ||
if (state.ended) { | ||
if (onTrackEnd) { | ||
onTrackEnd(trackEvt); | ||
} | ||
} else { | ||
if (onTrackCancel) { | ||
onTrackCancel(trackEvt); | ||
} | ||
} else { | ||
if (onTrackEnd) { | ||
onTrackEnd(trackEvt); | ||
} | ||
} | ||
@@ -336,10 +336,9 @@ } | ||
if (isMoving) { | ||
_extends(style, { | ||
touchAction: 'none', | ||
pointerEvents: 'none', | ||
WebkitUserSelect: 'none', | ||
MozUserSelect: 'none', | ||
msUserSelect: 'none', | ||
userSelect: 'none' | ||
}); | ||
style.pointerEvents = 'none'; | ||
style.touchAction = 'none'; | ||
style.msTouchAction = 'none'; | ||
style.msUserSelect = 'none'; | ||
style.MozUserSelect = 'none'; | ||
style.WebkitUserSelect = 'none'; | ||
style.userSelect = 'none'; | ||
} | ||
@@ -346,0 +345,0 @@ |
@@ -29,3 +29,3 @@ "use strict"; | ||
moveTime: 0, | ||
cancelled: true | ||
ended: false | ||
}; | ||
@@ -136,3 +136,3 @@ exports.initialPannableState = initialPannableState; | ||
startPoint: movePoint, | ||
cancelled: true | ||
ended: false | ||
}); | ||
@@ -151,4 +151,4 @@ }; | ||
translation: null, | ||
cancelled: false | ||
ended: true | ||
}); | ||
}; |
@@ -106,9 +106,9 @@ function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; } | ||
} else { | ||
if (state.pannable.cancelled) { | ||
if (state.pannable.ended) { | ||
dispatch({ | ||
type: 'dragCancel' | ||
type: 'dragEnd' | ||
}); | ||
} else { | ||
dispatch({ | ||
type: 'dragEnd' | ||
type: 'dragCancel' | ||
}); | ||
@@ -115,0 +115,0 @@ } |
@@ -61,10 +61,10 @@ var _excluded = ["disabled", "shouldStart", "onTrackStart", "onTrackEnd", "onTrackCancel", "onStart", "onMove", "onEnd", "onCancel", "render", "children"]; | ||
if (state.cancelled) { | ||
if (state.ended) { | ||
if (onEnd) { | ||
onEnd(evt); | ||
} | ||
} else { | ||
if (onCancel) { | ||
onCancel(evt); | ||
} | ||
} else { | ||
if (onEnd) { | ||
onEnd(evt); | ||
} | ||
} | ||
@@ -81,10 +81,10 @@ } | ||
if (state.cancelled) { | ||
if (state.ended) { | ||
if (onTrackEnd) { | ||
onTrackEnd(trackEvt); | ||
} | ||
} else { | ||
if (onTrackCancel) { | ||
onTrackCancel(trackEvt); | ||
} | ||
} else { | ||
if (onTrackEnd) { | ||
onTrackEnd(trackEvt); | ||
} | ||
} | ||
@@ -320,10 +320,9 @@ } | ||
if (isMoving) { | ||
_extends(style, { | ||
touchAction: 'none', | ||
pointerEvents: 'none', | ||
WebkitUserSelect: 'none', | ||
MozUserSelect: 'none', | ||
msUserSelect: 'none', | ||
userSelect: 'none' | ||
}); | ||
style.pointerEvents = 'none'; | ||
style.touchAction = 'none'; | ||
style.msTouchAction = 'none'; | ||
style.msUserSelect = 'none'; | ||
style.MozUserSelect = 'none'; | ||
style.WebkitUserSelect = 'none'; | ||
style.userSelect = 'none'; | ||
} | ||
@@ -330,0 +329,0 @@ |
@@ -24,3 +24,3 @@ function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; } | ||
moveTime: 0, | ||
cancelled: true | ||
ended: false | ||
}; | ||
@@ -129,3 +129,3 @@ | ||
startPoint: movePoint, | ||
cancelled: true | ||
ended: false | ||
}); | ||
@@ -144,4 +144,4 @@ }; | ||
translation: null, | ||
cancelled: false | ||
ended: true | ||
}); | ||
}; |
@@ -63,7 +63,7 @@ import PadContext from './PadContext'; | ||
else { | ||
if (state.pannable.cancelled) { | ||
dispatch({ type: 'dragCancel' }); | ||
if (state.pannable.ended) { | ||
dispatch({ type: 'dragEnd' }); | ||
} | ||
else { | ||
dispatch({ type: 'dragEnd' }); | ||
dispatch({ type: 'dragCancel' }); | ||
} | ||
@@ -70,0 +70,0 @@ } |
@@ -31,10 +31,10 @@ import reducer, { initialPannableState, } from './pannableReducer'; | ||
}; | ||
if (state.cancelled) { | ||
if (onCancel) { | ||
onCancel(evt); | ||
if (state.ended) { | ||
if (onEnd) { | ||
onEnd(evt); | ||
} | ||
} | ||
else { | ||
if (onEnd) { | ||
onEnd(evt); | ||
if (onCancel) { | ||
onCancel(evt); | ||
} | ||
@@ -50,10 +50,10 @@ } | ||
}; | ||
if (state.cancelled) { | ||
if (onTrackCancel) { | ||
onTrackCancel(trackEvt); | ||
if (state.ended) { | ||
if (onTrackEnd) { | ||
onTrackEnd(trackEvt); | ||
} | ||
} | ||
else { | ||
if (onTrackEnd) { | ||
onTrackEnd(trackEvt); | ||
if (onTrackCancel) { | ||
onTrackCancel(trackEvt); | ||
} | ||
@@ -247,10 +247,9 @@ } | ||
if (isMoving) { | ||
Object.assign(style, { | ||
touchAction: 'none', | ||
pointerEvents: 'none', | ||
WebkitUserSelect: 'none', | ||
MozUserSelect: 'none', | ||
msUserSelect: 'none', | ||
userSelect: 'none', | ||
}); | ||
style.pointerEvents = 'none'; | ||
style.touchAction = 'none'; | ||
style.msTouchAction = 'none'; | ||
style.msUserSelect = 'none'; | ||
style.MozUserSelect = 'none'; | ||
style.WebkitUserSelect = 'none'; | ||
style.userSelect = 'none'; | ||
} | ||
@@ -257,0 +256,0 @@ if (divProps.style) { |
@@ -9,3 +9,3 @@ export const initialPannableState = { | ||
moveTime: 0, | ||
cancelled: true, | ||
ended: false, | ||
}; | ||
@@ -87,3 +87,3 @@ const reducer = (state, action) => { | ||
startPoint: movePoint, | ||
cancelled: true, | ||
ended: false, | ||
}; | ||
@@ -100,4 +100,4 @@ }; | ||
translation: null, | ||
cancelled: false, | ||
ended: true, | ||
}; | ||
}; |
{ | ||
"name": "react-pannable", | ||
"version": "6.1.9", | ||
"version": "6.1.10", | ||
"description": "Flexible and Customizable Layouts for Scrolling Content with React", | ||
@@ -59,3 +59,4 @@ "keywords": [ | ||
"test": "jest -v", | ||
"prepare": "yarn clean && yarn build" | ||
"prepare": "yarn clean && yarn build", | ||
"prepublishOnly": "cd ../demo && yarn deploy" | ||
}, | ||
@@ -62,0 +63,0 @@ "peerDependencies": { |
@@ -12,3 +12,3 @@ import { Action, Point, Time } from './interfaces'; | ||
moveTime: Time; | ||
cancelled: boolean; | ||
ended: boolean; | ||
}; | ||
@@ -24,3 +24,3 @@ | ||
moveTime: 0, | ||
cancelled: true, | ||
ended: false, | ||
}; | ||
@@ -118,3 +118,3 @@ | ||
startPoint: movePoint, | ||
cancelled: true, | ||
ended: false, | ||
}; | ||
@@ -134,4 +134,4 @@ }; | ||
translation: null, | ||
cancelled: false, | ||
ended: true, | ||
}; | ||
}; |
@@ -11,3 +11,3 @@ import { Action, Point, Time } from './interfaces'; | ||
moveTime: Time; | ||
cancelled: boolean; | ||
ended: boolean; | ||
}; | ||
@@ -14,0 +14,0 @@ export declare const initialPannableState: PannableState; |
Sorry, the diff of this file is too big to display
Sorry, the diff of this file is too big to display
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
737501
16839