Skip to content
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

fix: drag upwards #326

Merged
merged 1 commit into from
May 7, 2024
Merged

fix: drag upwards #326

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
42 changes: 26 additions & 16 deletions src/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
'use client';

import * as DialogPrimitive from '@radix-ui/react-dialog';
import React from 'react';
import React, { useRef, useState } from 'react';
import { DrawerContext, useDrawerContext } from './context';
import './style.css';
import { usePreventScroll, isInput, isIOS } from './use-prevent-scroll';
Expand Down Expand Up @@ -808,23 +808,37 @@ const Content = React.forwardRef<HTMLDivElement, ContentProps>(function (
} = useDrawerContext();
const composedRef = useComposedRefs(ref, drawerRef);
const pointerStartRef = React.useRef<{ x: number; y: number } | null>(null);

React.useEffect(() => {
// Trigger enter animation without using CSS animation
setVisible(true);
}, []);
const wasBeyondThePointRef = React.useRef(false);

const isDeltaInDirection = (delta: { x: number; y: number }, direction: DrawerDirection, threshold = 0) => {
const deltaX = Math.abs(delta.x);
if (wasBeyondThePointRef.current) return true;

const deltaY = Math.abs(delta.y);
const deltaX = Math.abs(delta.x);
const isDeltaX = deltaX > deltaY;
const dFactor = ['bottom', 'right'].includes(direction) ? 1 : -1;

if (direction === 'left' || direction === 'right') {
return isDeltaX && deltaX > threshold;
const isReverseDirection = delta.x * dFactor < 0;
if (!isReverseDirection && deltaX >= 0 && deltaX <= threshold) {
return isDeltaX;
}
} else {
return !isDeltaX && deltaY > threshold;
const isReverseDirection = delta.y * dFactor < 0;
if (!isReverseDirection && deltaY >= 0 && deltaY <= threshold) {
return !isDeltaX;
}
}

wasBeyondThePointRef.current = true;
return true;
};

React.useEffect(() => {
// Trigger enter animation without using CSS animation
setVisible(true);
}, []);

return (
<DialogPrimitive.Content
vaul-drawer=""
Expand Down Expand Up @@ -872,17 +886,12 @@ const Content = React.forwardRef<HTMLDivElement, ContentProps>(function (
}}
onPointerMove={(event) => {
rest.onPointerMove?.(event);
if (!pointerStartRef.current) return null;
if (!pointerStartRef.current) return;
const yPosition = event.clientY - pointerStartRef.current.y;
const xPosition = event.clientX - pointerStartRef.current.x;

const isHorizontalSwipe = ['left', 'right'].includes(direction);
const clamp = ['left', 'top'].includes(direction) ? Math.min : Math.max;

const clampedX = isHorizontalSwipe ? clamp(0, xPosition) : 0;
const clampedY = !isHorizontalSwipe ? clamp(0, yPosition) : 0;
const swipeStartThreshold = event.pointerType === 'touch' ? 10 : 2;
const delta = { x: clampedX, y: clampedY };
const delta = { x: xPosition, y: yPosition };

const isAllowedToSwipe = isDeltaInDirection(delta, direction, swipeStartThreshold);
if (isAllowedToSwipe) onDrag(event);
Expand All @@ -893,6 +902,7 @@ const Content = React.forwardRef<HTMLDivElement, ContentProps>(function (
onPointerUp={(event) => {
rest.onPointerUp?.(event);
pointerStartRef.current = null;
wasBeyondThePointRef.current = false;
onRelease(event);
}}
/>
Expand Down
Loading