A drawer component for React.
fix: don't animate initially if defaultOpen is set to true (#488)
Emil Kowalski777c19e71de8
diff --git a/src/context.ts b/src/context.tsindex 557b9c7..119f2e5 100644--- a/src/context.ts+++ b/src/context.ts@@ -31,6 +31,7 @@ interface DrawerContextValue {handleOnly?: boolean;container?: HTMLElement | null;autoFocus?: boolean;+ shouldAnimate?: React.RefObject<boolean>;}export const DrawerContext = React.createContext<DrawerContextValue>({@@ -57,6 +58,7 @@ export const DrawerContext = React.createContext<DrawerContextValue>({setActiveSnapPoint: () => {},closeDrawer: () => {},direction: 'bottom',+ shouldAnimate: { current: true },shouldScaleBackground: false,setBackgroundColorOnScale: true,noBodyStyles: false,diff --git a/src/index.tsx b/src/index.tsxindex 5f13161..9372d36 100644--- a/src/index.tsx+++ b/src/index.tsx@@ -103,7 +103,7 @@ export type DialogProps = {*/direction?: 'top' | 'bottom' | 'left' | 'right';/**- * Opened by default, still reacts to `open` state changes+ * Opened by default, skips initial enter animation. Still reacts to `open` state changes* @default false*/defaultOpen?: boolean;@@ -206,6 +206,7 @@ export function Root({const nestedOpenChangeTimer = React.useRef<NodeJS.Timeout | null>(null);const pointerStart = React.useRef(0);const keyboardIsOpen = React.useRef(false);+ const shouldAnimate = React.useRef(!defaultOpen);const previousDiffFromInitial = React.useRef(0);const drawerRef = React.useRef<HTMLDivElement>(null);const drawerHeightRef = React.useRef(drawerRef.current?.getBoundingClientRect().height || 0);@@ -465,6 +466,12 @@ export function Root({}}+ React.useEffect(() => {+ window.requestAnimationFrame(() => {+ shouldAnimate.current = true;+ });+ }, []);+React.useEffect(() => {function onVisualViewportChange() {if (!drawerRef.current || !repositionInputs) return;@@ -763,6 +770,7 @@ export function Root({onRelease,onDrag,dismissible,+ shouldAnimate,handleOnly,isOpen,isDragging,@@ -791,7 +799,7 @@ export function Root({export const Overlay = React.forwardRef<HTMLDivElement, React.ComponentPropsWithoutRef<typeof DialogPrimitive.Overlay>>(function ({ ...rest }, ref) {- const { overlayRef, snapPoints, onRelease, shouldFade, isOpen, modal } = useDrawerContext();+ const { overlayRef, snapPoints, onRelease, shouldFade, isOpen, modal, shouldAnimate } = useDrawerContext();const composedRef = useComposedRefs(ref, overlayRef);const hasSnapPoints = snapPoints && snapPoints.length > 0;@@ -809,6 +817,7 @@ export const Overlay = React.forwardRef<HTMLDivElement, React.ComponentPropsWithdata-vaul-overlay=""data-vaul-snap-points={isOpen && hasSnapPoints ? 'true' : 'false'}data-vaul-snap-points-overlay={isOpen && shouldFade ? 'true' : 'false'}+ data-vaul-animate={shouldAnimate?.current ? 'true' : 'false'}{...rest}/>);@@ -837,6 +846,7 @@ export const Content = React.forwardRef<HTMLDivElement, ContentProps>(function (snapPoints,container,handleOnly,+ shouldAnimate,autoFocus,} = useDrawerContext();// Needed to use transition instead of animations@@ -893,6 +903,7 @@ export const Content = React.forwardRef<HTMLDivElement, ContentProps>(function (data-vaul-delayed-snap-points={delayedSnapPoints ? 'true' : 'false'}data-vaul-snap-points={isOpen && hasSnapPoints ? 'true' : 'false'}data-vaul-custom-container={container ? 'true' : 'false'}+ data-vaul-animate={shouldAnimate?.current ? 'true' : 'false'}{...rest}ref={composedRef}style={diff --git a/src/style.css b/src/style.cssindex 67dcc19..9d7c6bf 100644--- a/src/style.css+++ b/src/style.css@@ -47,7 +47,7 @@}[data-vaul-drawer][data-vaul-snap-points='true'][data-vaul-drawer-direction='right'] {- transform: translate3d(var(--initial-transform, 100%) %, 0, 0);+ transform: translate3d(var(--initial-transform, 100%), 0, 0);}[data-vaul-drawer][data-vaul-delayed-snap-points='true'][data-vaul-drawer-direction='top'] {@@ -77,6 +77,10 @@animation-name: fadeOut;}+[data-vaul-animate='false'] {+ animation: none !important;+}+[data-vaul-overlay][data-vaul-snap-points='true'] {opacity: 0;transition: opacity 0.5s cubic-bezier(0.32, 0.72, 0, 1);