A drawer component for React.
Prevent hooks from running if drawer was never opened (#125)
Emil Kowalski9a26d57cf8db
diff --git a/src/index.tsx b/src/index.tsxindex 84a1b92..08db008 100644--- a/src/index.tsx+++ b/src/index.tsx@@ -69,6 +69,7 @@ function Root({onClose,}: DialogProps) {const [isOpen = false, setIsOpen] = React.useState<boolean>(false);+ const [hasBeenOpened, setHasBeenOpened] = React.useState<boolean>(false);// Not visible = translateY(100%)const [visible, setVisible] = React.useState<boolean>(false);const [mounted, setMounted] = React.useState<boolean>(false);@@ -112,10 +113,10 @@ function Root({});usePreventScroll({- isDisabled: !isOpen || isDragging || !modal || justReleased,+ isDisabled: !isOpen || isDragging || !modal || justReleased || !hasBeenOpened,});- usePositionFixed({ isOpen, modal, nested });+ usePositionFixed({ isOpen, modal, nested, hasBeenOpened });function getScale() {return (window.innerWidth - WINDOW_TOP_OFFSET) / window.innerWidth;@@ -395,6 +396,7 @@ function Root({React.useEffect(() => {if (openProp) {setIsOpen(true);+ setHasBeenOpened(true);} else {closeDrawer();}@@ -606,6 +608,7 @@ function Root({if (!o) {closeDrawer();} else {+ setHasBeenOpened(true);setIsOpen(o);}}}diff --git a/src/use-position-fixed.ts b/src/use-position-fixed.tsindex f0630f3..d25d4c2 100644--- a/src/use-position-fixed.ts+++ b/src/use-position-fixed.ts@@ -1,9 +1,18 @@import React from 'react';-import { isIOS } from './use-prevent-scroll';let previousBodyPosition: Record<string, string> | null = null;-export function usePositionFixed({ isOpen, modal, nested }: { isOpen: boolean; modal: boolean; nested: boolean }) {+export function usePositionFixed({+ isOpen,+ modal,+ nested,+ hasBeenOpened,+}: {+ isOpen: boolean;+ modal: boolean;+ nested: boolean;+ hasBeenOpened: boolean;+}) {const scrollPos = React.useRef(0);function setPositionFixed() {@@ -76,7 +85,7 @@ export function usePositionFixed({ isOpen, modal, nested }: { isOpen: boolean; m}, []);React.useEffect(() => {- if (nested) return;+ if (nested || !hasBeenOpened) return;// This is needed to force Safari toolbar to show **before** the drawer starts animating to prevent a gnarly shift from happeningif (isOpen) {setPositionFixed();