A drawer component for React.
fix: snap points (#415)
Emil Kowalski17b32f2e4717
diff --git a/README.md b/README.mdindex 830d9b7..4557b64 100644--- a/README.md+++ b/README.md@@ -72,6 +72,8 @@ Additional props:`defaultOpen`: Opened by default, still reacts to `open` state changes.+`snapToSequentialPoint`: Disabled velocity based swiping for snap points. This means that a snap point won't be skipped even if the velocity is high enough. Useful if each snap point in a drawer is equally important.+`[data-vaul-no-drag]`: When interacting with an element with this data attribute, the drawer won't be dragged.### Controlled Drawerdiff --git a/src/index.tsx b/src/index.tsxindex bcfc556..9bc2dd9 100644--- a/src/index.tsx+++ b/src/index.tsx@@ -53,6 +53,7 @@ export type DialogProps = {direction?: 'top' | 'bottom' | 'left' | 'right';defaultOpen?: boolean;repositionInputs?: boolean;+ snapToSequentialPoint?: boolean;container?: HTMLElement | null;} & (WithFadeFromProps | WithoutFadeFromProps);@@ -77,6 +78,7 @@ export function Root({noBodyStyles,direction = 'bottom',defaultOpen = false,+ snapToSequentialPoint = false,repositionInputs = true,container,}: DialogProps) {@@ -126,6 +128,7 @@ export function Root({onSnapPointChange,direction,container,+ snapToSequentialPoint,});usePreventScroll({@@ -602,6 +605,8 @@ export function Root({onOpenChange={(open) => {if (open) {setHasBeenOpened(true);+ } else {+ closeDrawer();}setIsOpen(open);}}diff --git a/src/use-snap-points.ts b/src/use-snap-points.tsindex adb868c..53d2848 100644--- a/src/use-snap-points.ts+++ b/src/use-snap-points.ts@@ -14,6 +14,7 @@ export function useSnapPoints({onSnapPointChange,direction = 'bottom',container,+ snapToSequentialPoint,}: {activeSnapPointProp?: number | string | null;setActiveSnapPointProp?(snapPoint: number | null | string): void;@@ -24,6 +25,7 @@ export function useSnapPoints({onSnapPointChange(activeSnapPointIndex: number): void;direction?: DrawerDirection;container?: HTMLElement | null | undefined;+ snapToSequentialPoint?: boolean;}) {const [activeSnapPoint, setActiveSnapPoint] = useControllableState<string | number | null>({prop: activeSnapPointProp,@@ -137,7 +139,7 @@ export function useSnapPoints({});}- setActiveSnapPoint(newSnapPointIndex !== null ? snapPoints?.[newSnapPointIndex] : null);+ setActiveSnapPoint(snapPoints?.[Math.max(newSnapPointIndex, 0)]);},[drawerRef.current, snapPoints, snapPointsOffset, fadeFromIndex, overlayRef, setActiveSnapPoint],);@@ -179,13 +181,13 @@ export function useSnapPoints({});}- if (velocity > 2 && !hasDraggedUp) {+ if (!snapToSequentialPoint && velocity > 2 && !hasDraggedUp) {if (dismissible) closeDrawer();else snapToPoint(snapPointsOffset[0]); // snap to initial pointreturn;}- if (velocity > 2 && hasDraggedUp && snapPointsOffset && snapPoints) {+ if (!snapToSequentialPoint && velocity > 2 && hasDraggedUp && snapPointsOffset && snapPoints) {snapToPoint(snapPointsOffset[snapPoints.length - 1] as number);return;}