fix: make open transitions more interruptible on iOS (stipsan#23)

la55u · Dec 7, 2020 · f898dd0 · f898dd0
1 parent 8ef2206
commit f898dd0
Showing 1 changed file with 2 additions and 6 deletions.
diff --git a/src/BottomSheet.tsx b/src/BottomSheet.tsx
@@ -272,15 +272,14 @@ export const BottomSheet = React.forwardRef<
 
           if (maybeCancel()) return
 
+          canDragRef.current = true
           await Promise.all([
             scrollLockRef.current.activate(),
             focusTrapRef.current.activate(),
             ariaHiderRef.current.activate(),
           ])
 
           if (maybeCancel()) return
-
-          canDragRef.current = true
         } else {
           console.log('animate open')
           await next({
@@ -296,6 +295,7 @@ export const BottomSheet = React.forwardRef<
 
           if (maybeCancel()) return
 
+          canDragRef.current = true
           await Promise.all([
             scrollLockRef.current.activate(),
             focusTrapRef.current.activate(),
@@ -317,7 +317,6 @@ export const BottomSheet = React.forwardRef<
 
           if (maybeCancel()) return
 
-          canDragRef.current = true
           heightRef.current = defaultSnapRef.current
           shouldInterpolateRefs.current = true
           await next({
@@ -544,19 +543,16 @@ export const BottomSheet = React.forwardRef<
   useDrag(handleDrag, {
     domTarget: backdropRef,
     eventOptions: { capture: true },
-    enabled: ready && on,
     axis: 'y',
   })
   useDrag(handleDrag, {
     domTarget: headerRef,
     eventOptions: { capture: true },
-    enabled: ready && on,
     axis: 'y',
   })
   useDrag(handleDrag, {
     domTarget: footerRef,
     eventOptions: { capture: true },
-    enabled: ready && on,
     axis: 'y',
   })