Skip to content

armgit / vaul

Public Imported from GitHub
0

A drawer component for React.

fix: fadeFromIndex prop (#416)

Emil Kowalskia842e8639e54
diff --git a/src/style.css b/src/style.css
index 50b1cab..349f712 100644
--- a/src/style.css
+++ b/src/style.css
@@ -88,7 +88,7 @@
[data-vaul-overlay][data-vaul-snap-points='false'][data-state='open'] {
animation-name: fadeIn;
}
-[data-vaul-overlay][data-vaul-snap-points='false'][data-state='closed'] {
+[data-vaul-overlay][data-state='closed'] {
animation-name: fadeOut;
}
diff --git a/src/use-snap-points.ts b/src/use-snap-points.ts
index 53d2848..f3655c0 100644
--- a/src/use-snap-points.ts
+++ b/src/use-snap-points.ts
@@ -59,6 +59,11 @@ export function useSnapPoints({
[snapPoints, activeSnapPoint],
);
+ const activeSnapPointIndex = React.useMemo(
+ () => snapPoints?.findIndex((snapPoint) => snapPoint === activeSnapPoint),
+ [snapPoints, activeSnapPoint],
+ );
+
const shouldFade =
(snapPoints &&
snapPoints.length > 0 &&
@@ -67,11 +72,6 @@ export function useSnapPoints({
snapPoints[fadeFromIndex] === activeSnapPoint) ||
!snapPoints;
- const activeSnapPointIndex = React.useMemo(
- () => snapPoints?.findIndex((snapPoint) => snapPoint === activeSnapPoint),
- [snapPoints, activeSnapPoint],
- );
-
const snapPointsOffset = React.useMemo(() => {
const containerSize = container
? { width: container.getBoundingClientRect().width, height: container.getBoundingClientRect().height }
@@ -126,7 +126,8 @@ export function useSnapPoints({
if (
snapPointsOffset &&
newSnapPointIndex !== snapPointsOffset.length - 1 &&
- newSnapPointIndex !== fadeFromIndex
+ newSnapPointIndex !== fadeFromIndex &&
+ newSnapPointIndex < fadeFromIndex
) {
set(overlayRef.current, {
transition: `opacity ${TRANSITIONS.DURATION}s cubic-bezier(${TRANSITIONS.EASE.join(',')})`,