Skip to content

feat(PullRefresh): add a maxPullDistance param to enable cancellation #13484

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
CoderMonkie wants to merge 1 commit into
base: main
Choose a base branch
from
+25 −2
Open

feat(PullRefresh): add a maxPullDistance param to enable cancellation #13484

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
27 changes: 25 additions & 2 deletions packages/vant/src/pull-refresh/PullRefresh.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ export const pullRefreshProps = {
pullDistance: numericProp,
successDuration: makeNumericProp(500),
animationDuration: makeNumericProp(300),
maxPullDistance: numericProp,
};

export type PullRefreshProps = ExtractPropTypes<typeof pullRefreshProps>;
Expand Down Expand Up @@ -88,6 +89,15 @@ export default defineComponent({
const ease = (distance: number) => {
const pullDistance = +(props.pullDistance || props.headHeight);

if (props.maxPullDistance) {
const maxDistance = +props.maxPullDistance;
const ratio = distance / maxDistance;
if (ratio > 0.618) {
const dampingFactor = 1 - Math.pow(ratio - 0.618, 2) * 2.5;
distance *= dampingFactor;
}
}

if (distance > pullDistance) {
if (distance < pullDistance * 2) {
distance = pullDistance + (distance - pullDistance) / 2;
Expand Down Expand Up @@ -184,8 +194,15 @@ export default defineComponent({
touch.move(event);

if (reachTop && deltaY.value >= 0 && touch.isVertical()) {
preventDefault(event);
setStatus(ease(deltaY.value));
const maxPullDistance = +(props.maxPullDistance || Infinity);

if (deltaY.value > maxPullDistance) {
setStatus(0);
// to enable default scroll behavior in this case
} else {
preventDefault(event);
setStatus(ease(deltaY.value));
}
}
}
};
Expand All @@ -194,6 +211,12 @@ export default defineComponent({
if (reachTop && touch.deltaY.value && isTouchable()) {
state.duration = +props.animationDuration;

const maxPullDistance = +(props.maxPullDistance || Infinity);
if (touch.deltaY.value > maxPullDistance) {
setStatus(0);
return;
}

if (state.status === 'loosing') {
setStatus(+props.headHeight, true);
emit('update:modelValue', true);
Expand Down