fix: disable screens when mode is modal on older expo versions

react-navigation · Feb 1, 2020 · 94d7b28 · 94d7b28
1 parent b19b3b2
commit 94d7b28
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 19 deletions.
diff --git a/example/src/Screens/StackTransparent.tsx b/example/src/Screens/StackTransparent.tsx
@@ -86,7 +86,7 @@ export default function SimpleStackScreen({ navigation, ...rest }: Props) {
   });
 
   return (
-    <SimpleStack.Navigator headerMode="screen" {...rest}>
+    <SimpleStack.Navigator mode="modal" {...rest}>
       <SimpleStack.Screen
         name="Article"
         component={ArticleScreen}
@@ -99,8 +99,6 @@ export default function SimpleStackScreen({ navigation, ...rest }: Props) {
           headerShown: false,
           cardStyle: { backgroundColor: 'transparent' },
           cardOverlayEnabled: true,
-          gestureEnabled: true,
-          gestureDirection: 'vertical-inverted',
           cardStyleInterpolator: ({ current: { progress } }) => ({
             cardStyle: {
               opacity: progress.interpolate({
@@ -147,12 +145,8 @@ const styles = StyleSheet.create({
   dialog: {
     padding: 16,
     width: '90%',
+    maxWidth: 400,
     borderRadius: 3,
-    elevation: 6,
-    shadowColor: 'black',
-    shadowOpacity: 0.15,
-    shadowOffset: { width: 0, height: 2 },
-    shadowRadius: 10,
   },
   close: {
     alignSelf: 'flex-end',

diff --git a/packages/stack/src/views/Stack/CardStack.tsx b/packages/stack/src/views/Stack/CardStack.tsx
@@ -135,18 +135,18 @@ const MaybeScreen = ({
           // https://facebook.github.io/react-native/docs/view#removeclippedsubviews
           // This can be useful if screens is not enabled
           // It's buggy on iOS, so we don't enable it there
+          top:
+            enabled && typeof active === 'number' && !active ? FAR_FAR_AWAY : 0,
           transform: [
             {
+              // If the `active` prop is animated node, we can't use the `left` property due to native driver
+              // So we use `translateY` instead
               translateY:
-                Platform.OS !== 'ios' && enabled
-                  ? typeof active === 'number'
-                    ? active
-                      ? 0
-                      : FAR_FAR_AWAY
-                    : active.interpolate({
-                        inputRange: [0, 1],
-                        outputRange: [FAR_FAR_AWAY, 0],
-                      })
+                enabled && typeof active !== 'number'
+                  ? active.interpolate({
+                      inputRange: [0, 1],
+                      outputRange: [FAR_FAR_AWAY, 0],
+                    })
                   : 0,
             },
           ],
@@ -445,7 +445,9 @@ export default class CardStack extends React.Component<Props, State> {
 
     // Screens is buggy on iOS, so we don't enable it there
     // For modals, usually we want the screen underneath to be visible, so also disable it there
-    const isScreensEnabled = Platform.OS !== 'ios';
+    const isScreensEnabled =
+      Platform.OS !== 'ios' &&
+      (isInsufficientExpoVersion ? mode !== 'modal' : true);
 
     return (
       <React.Fragment>
@@ -460,9 +462,9 @@ export default class CardStack extends React.Component<Props, State> {
             const scene = scenes[index];
 
             // Display current screen and a screen beneath.
-
             let isScreenActive: Animated.AnimatedInterpolation | 0 | 1 =
               index >= self.length - 2 ? 1 : 0;
+
             if (isInsufficientExpoVersion) {
               isScreenActive =
                 index === self.length - 1