fix: sheet not open on web

ammarahm-ed · Aug 28, 2022 · 3ba0263 · 3ba0263 · vercel · Aug 28, 2022
1 parent 758c5bf
commit 3ba0263
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 4 deletions.
diff --git a/dist/src/index.d.ts.map b/dist/src/index.d.ts.map
diff --git a/dist/src/index.js b/dist/src/index.js
@@ -54,6 +54,7 @@ export default forwardRef(function ActionSheet(_a, ref) {
     var keyboardWasVisible = useRef(false);
     var prevKeyboardHeight = useRef(0);
     var lock = useRef(false);
+    var panViewRef = useRef();
     var gestureBoundaries = useRef({});
     var _8 = useState({
         width: Dimensions.get('window').width,
@@ -225,7 +226,7 @@ export default forwardRef(function ActionSheet(_a, ref) {
                 portrait: height > width
             });
         });
-        if (safeAreaPaddingTop.current !== 0 || Platform.OS === 'android') {
+        if (safeAreaPaddingTop.current !== 0 || Platform.OS !== 'ios') {
             actionSheetEventManager.publish('safeAreaLayout');
         }
     }, [dimensions.width, isModal, keyboard.keyboardShown]);
@@ -367,6 +368,16 @@ export default forwardRef(function ActionSheet(_a, ref) {
                             break;
                         }
                     }
+                    if (Platform.OS === 'web') {
+                        if (!gestures) {
+                            //@ts-ignore
+                            panViewRef.current.style.touchAction = 'none';
+                        }
+                        else {
+                            //@ts-ignore
+                            panViewRef.current.style.touchAction = 'auto';
+                        }
+                    }
                     return gestures;
                 },
                 onStartShouldSetPanResponder: function (event, _gesture) {
@@ -669,7 +680,7 @@ export default forwardRef(function ActionSheet(_a, ref) {
                         translateY: animations.translateY
                     },
                 ] })}>
-                {dimensions.height === 0 ? null : (<Animated.View {...handlers.panHandlers} onLayout={onSheetLayout} testID={(_k = props.testIDs) === null || _k === void 0 ? void 0 : _k.sheet} style={[
+                {dimensions.height === 0 ? null : (<Animated.View {...handlers.panHandlers} onLayout={onSheetLayout} ref={panViewRef} testID={(_k = props.testIDs) === null || _k === void 0 ? void 0 : _k.sheet} style={[
                     styles.container,
                     {
                         borderTopRightRadius: 10,

diff --git a/src/index.tsx b/src/index.tsx
@@ -121,6 +121,7 @@ export default forwardRef<ActionSheetRef, ActionSheetProps>(
     const keyboardWasVisible = useRef(false);
     const prevKeyboardHeight = useRef(0);
     const lock = useRef(false);
+    const panViewRef = useRef<View>();
     const gestureBoundaries = useRef<{
       [name: string]: LayoutRectangle & {
         scrollOffset?: number;
@@ -346,7 +347,7 @@ export default forwardRef<ActionSheetRef, ActionSheetProps>(
           },
         );
 
-        if (safeAreaPaddingTop.current !== 0 || Platform.OS === 'android') {
+        if (safeAreaPaddingTop.current !== 0 || Platform.OS !== 'ios') {
           actionSheetEventManager.publish('safeAreaLayout');
         }
       },
@@ -508,6 +509,15 @@ export default forwardRef<ActionSheetRef, ActionSheetProps>(
                     break;
                   }
                 }
+                if (Platform.OS === 'web') {
+                  if (!gestures) {
+                    //@ts-ignore
+                    panViewRef.current.style.touchAction = 'none';
+                  } else {
+                    //@ts-ignore
+                    panViewRef.current.style.touchAction = 'auto';
+                  }
+                }
                 return gestures;
               },
               onStartShouldSetPanResponder: (event, _gesture) => {
@@ -532,6 +542,7 @@ export default forwardRef<ActionSheetRef, ActionSheetProps>(
                       gestures = false;
                     }
                   }
+
                   return gestures;
                 }
                 return true;
@@ -902,6 +913,7 @@ export default forwardRef<ActionSheetRef, ActionSheetProps>(
                   <Animated.View
                     {...handlers.panHandlers}
                     onLayout={onSheetLayout}
+                    ref={panViewRef}
                     testID={props.testIDs?.sheet}
                     style={[
                       styles.container,