stream-chat-react-native-core 9.3.1 → 9.4.0-beta.10

package/src/components/Poll/components/PollButtons.tsx

@@ -1,10 +1,10 @@
 import React, { useCallback, useMemo } from 'react';
-import { Modal, StyleSheet, View } from 'react-native';
-import { GestureHandlerRootView } from 'react-native-gesture-handler';
+import { StyleSheet, View } from 'react-native';
 
 import { GenericPollButton, PollButtonProps } from './Button';
 import { PollAnswersList } from './PollAnswersList';
 import { PollInputDialog } from './PollInputDialog';
+import { PollModal } from './PollModal';
 import { PollModalHeader } from './PollModalHeader';
 import { PollAllOptions } from './PollOption';
 import { PollResults } from './PollResults';
@@ -12,7 +12,6 @@ import { PollResults } from './PollResults';
 import { useChatContext, usePollContext, useTheme, useTranslationContext } from '../../../contexts';
 import { primitives } from '../../../theme';
 import { defaultPollOptionCount } from '../../../utils/constants';
-import { SafeAreaViewWrapper } from '../../UIComponents/SafeAreaViewWrapper';
 import {
   useAddCommentOpen,
   useAllCommentsOpen,
@@ -51,14 +50,10 @@ export const ViewResultsButton = (props: PollButtonProps) => {
         type='outline'
       />
       {showResults ? (
-        <Modal animationType='slide' onRequestClose={closeViewResults} visible={showResults}>
-          <GestureHandlerRootView style={styles.modalRoot}>
-            <SafeAreaViewWrapper style={styles.safeArea}>
-              <PollModalHeader onPress={closeViewResults} title={t('Poll Results')} />
-              <PollResults message={message} poll={poll} />
-            </SafeAreaViewWrapper>
-          </GestureHandlerRootView>
-        </Modal>
+        <PollModal onRequestClose={closeViewResults} visible={showResults}>
+          <PollModalHeader onPress={closeViewResults} title={t('Poll Results')} />
+          <PollResults message={message} poll={poll} />
+        </PollModal>
       ) : null}
     </>
   );
@@ -81,8 +76,6 @@ export const ShowAllOptionsButton = (props: PollButtonProps) => {
     openAllOptions();
   }, [message, onPress, openAllOptions, poll]);
 
-  const styles = useStyles();
-
   return (
     <>
       {options && options.length > defaultPollOptionCount ? (
@@ -92,14 +85,10 @@ export const ShowAllOptionsButton = (props: PollButtonProps) => {
         />
       ) : null}
       {showAllOptions ? (
-        <Modal animationType='slide' onRequestClose={closeAllOptions} visible={showAllOptions}>
-          <GestureHandlerRootView style={styles.modalRoot}>
-            <SafeAreaViewWrapper style={styles.safeArea}>
-              <PollModalHeader onPress={closeAllOptions} title={t('Poll Options')} />
-              <PollAllOptions message={message} poll={poll} />
-            </SafeAreaViewWrapper>
-          </GestureHandlerRootView>
-        </Modal>
+        <PollModal onRequestClose={closeAllOptions} visible={showAllOptions}>
+          <PollModalHeader onPress={closeAllOptions} title={t('Poll Options')} />
+          <PollAllOptions message={message} poll={poll} />
+        </PollModal>
       ) : null}
     </>
   );
@@ -122,8 +111,6 @@ export const ShowAllCommentsButton = (props: PollButtonProps) => {
     openAllComments();
   }, [message, onPress, openAllComments, poll]);
 
-  const styles = useStyles();
-
   return (
     <>
       {answersCount && answersCount > 0 ? (
@@ -133,14 +120,10 @@ export const ShowAllCommentsButton = (props: PollButtonProps) => {
         />
       ) : null}
       {showAnswers ? (
-        <Modal animationType='slide' onRequestClose={closeAllComments} visible={showAnswers}>
-          <GestureHandlerRootView style={styles.modalRoot}>
-            <SafeAreaViewWrapper style={styles.safeArea}>
-              <PollModalHeader onPress={closeAllComments} title={t('Poll Comments')} />
-              <PollAnswersList message={message} poll={poll} />
-            </SafeAreaViewWrapper>
-          </GestureHandlerRootView>
-        </Modal>
+        <PollModal onRequestClose={closeAllComments} visible={showAnswers}>
+          <PollModalHeader onPress={closeAllComments} title={t('Poll Comments')} />
+          <PollAnswersList message={message} poll={poll} />
+        </PollModal>
       ) : null}
     </>
   );
@@ -254,9 +237,6 @@ const useStyles = () => {
   return useMemo(() => {
     return StyleSheet.create({
       buttonsContainer: { gap: primitives.spacingXs },
-      modalRoot: {
-        flex: 1,
-      },
       endVoteButton: {
         borderColor: isPollCreatedByClient
           ? semantics.chatBorderOnChatOutgoing
@@ -267,10 +247,6 @@ const useStyles = () => {
           ? semantics.chatBorderOnChatOutgoing
           : semantics.chatBorderOnChatIncoming,
       },
-      safeArea: {
-        backgroundColor: semantics.backgroundCoreElevation1,
-        flex: 1,
-      },
     });
   }, [semantics, isPollCreatedByClient]);
 };

package/src/components/Poll/components/PollInputDialog.tsx

@@ -72,19 +72,11 @@ export const PollInputDialog = ({
               />
             </View>
             <View style={[styles.buttonContainer, buttonContainer]}>
-              <Button
-                variant={'secondary'}
-                type={'ghost'}
-                label={t('Cancel')}
-                size='md'
-                onPress={closeDialog}
-                style={styles.button}
-              />
               <Button
                 variant={'primary'}
                 type={'solid'}
                 label={t('Send')}
-                size='md'
+                size='lg'
                 onPress={() => {
                   onSubmit(dialogInput);
                   closeDialog();
@@ -92,6 +84,14 @@ export const PollInputDialog = ({
                 style={styles.button}
                 disabled={!dialogInput}
               />
+              <Button
+                variant={'secondary'}
+                type={'outline'}
+                label={t('Cancel')}
+                size='lg'
+                onPress={closeDialog}
+                style={styles.button}
+              />
             </View>
           </Animated.View>
         </KeyboardAvoidingView>
@@ -112,8 +112,8 @@ const useStyles = () => {
   return useMemo(
     () =>
       StyleSheet.create({
-        button: { flex: 1, width: undefined, ...button },
-        buttonContainer: { flexDirection: 'row', gap: primitives.spacingXs },
+        button: { width: undefined, ...button },
+        buttonContainer: { gap: primitives.spacingXs },
         container: {
           backgroundColor: semantics.backgroundCoreElevation1,
           borderRadius: primitives.radiusXl,
@@ -132,7 +132,7 @@ const useStyles = () => {
         input: {
           alignItems: 'center',
           borderColor: semantics.borderUtilityActive,
-          borderRadius: primitives.radiusMd,
+          borderRadius: primitives.radiusLg,
           borderWidth: 1,
           fontSize: primitives.typographyFontSizeMd,
           padding: primitives.spacingSm,

package/src/components/Poll/components/PollModal.tsx

@@ -0,0 +1,55 @@
+import React, { PropsWithChildren, useMemo } from 'react';
+import { Modal, ModalProps, StyleSheet } from 'react-native';
+import { GestureHandlerRootView } from 'react-native-gesture-handler';
+
+import { useTheme } from '../../../contexts';
+import { SafeAreaViewWrapper } from '../../UIComponents/SafeAreaViewWrapper';
+
+export type PollModalProps = PropsWithChildren<{
+  animationType?: ModalProps['animationType'];
+  onRequestClose?: () => void;
+  visible?: boolean;
+}>;
+
+export const PollModal = ({
+  animationType = 'slide',
+  children,
+  onRequestClose,
+  visible,
+}: PollModalProps) => {
+  const styles = useStyles();
+
+  return (
+    <Modal
+      animationType={animationType}
+      navigationBarTranslucent
+      onRequestClose={onRequestClose}
+      presentationStyle='pageSheet'
+      statusBarTranslucent
+      visible={visible}
+    >
+      <GestureHandlerRootView style={styles.root}>
+        <SafeAreaViewWrapper style={styles.safeArea}>{children}</SafeAreaViewWrapper>
+      </GestureHandlerRootView>
+    </Modal>
+  );
+};
+
+const useStyles = () => {
+  const {
+    theme: { semantics },
+  } = useTheme();
+  return useMemo(
+    () =>
+      StyleSheet.create({
+        root: {
+          flex: 1,
+        },
+        safeArea: {
+          flex: 1,
+          backgroundColor: semantics.backgroundCoreElevation1,
+        },
+      }),
+    [semantics],
+  );
+};

package/src/components/Poll/components/PollModalHeader.tsx

@@ -2,7 +2,7 @@ import React, { useMemo } from 'react';
 import { StyleSheet, Text, View } from 'react-native';
 
 import { useTheme } from '../../../contexts';
-import { ArrowLeft } from '../../../icons/arrow-left';
+import { Cross } from '../../../icons/xmark-1';
 import { primitives } from '../../../theme';
 import { Button } from '../../ui';
 
@@ -27,10 +27,10 @@ export const PollModalHeader = ({ onPress, title }: PollModalHeaderProps) => {
         <Button
           accessibilityLabelKey='a11y/Close poll'
           variant='secondary'
-          type='ghost'
+          type='outline'
           size='md'
           iconOnly
-          LeadingIcon={ArrowLeft}
+          LeadingIcon={Cross}
           onPress={onPress}
           testID='poll-results-close-button'
         />
@@ -56,8 +56,7 @@ const useStyles = () => {
           alignItems: 'center',
           flexDirection: 'row',
           justifyContent: 'space-between',
-          paddingHorizontal: primitives.spacingMd,
-          paddingVertical: 10,
+          padding: primitives.spacingMd,
           backgroundColor: semantics.backgroundCoreElevation1,
         },
         centerContainer: {

package/src/components/Poll/components/PollResults/PollResultItem.tsx

@@ -1,6 +1,5 @@
 import React, { useCallback, useMemo, useState } from 'react';
-import { Modal, StyleSheet, Text, View } from 'react-native';
-import { GestureHandlerRootView } from 'react-native-gesture-handler';
+import { StyleSheet, Text, View } from 'react-native';
 
 import { LocalMessage, Poll, PollOption, PollVote as PollVoteClass } from 'stream-chat';
 
@@ -15,9 +14,9 @@ import {
 } from '../../../../contexts';
 
 import { primitives } from '../../../../theme';
-import { SafeAreaViewWrapper } from '../../../UIComponents/SafeAreaViewWrapper';
 import { usePollState } from '../../hooks/usePollState';
 import { GenericPollButton } from '../Button';
+import { PollModal } from '../PollModal';
 import { PollModalHeader } from '../PollModalHeader';
 
 export type ShowAllVotesButtonProps = {
@@ -62,18 +61,14 @@ export const ShowAllVotesButton = (props: ShowAllVotesButtonProps) => {
         </View>
       ) : null}
       {showAllVotes ? (
-        <Modal
+        <PollModal
           animationType='fade'
           onRequestClose={() => setShowAllVotes(false)}
           visible={showAllVotes}
         >
-          <GestureHandlerRootView style={styles.modalRoot}>
-            <SafeAreaViewWrapper style={styles.safeArea}>
-              <PollModalHeader onPress={() => setShowAllVotes(false)} title={t('Votes')} />
-              <PollOptionFullResults message={message} option={option} poll={poll} />
-            </SafeAreaViewWrapper>
-          </GestureHandlerRootView>
-        </Modal>
+          <PollModalHeader onPress={() => setShowAllVotes(false)} title={t('Votes')} />
+          <PollOptionFullResults message={message} option={option} poll={poll} />
+        </PollModal>
       ) : null}
     </>
   );
@@ -156,9 +151,6 @@ const useStyles = () => {
         alignItems: 'center',
         paddingBottom: primitives.spacingXs,
       },
-      modalRoot: {
-        flex: 1,
-      },
       title: {
         flex: 1,
         fontSize: primitives.typographyFontSizeLg,
@@ -183,10 +175,6 @@ const useStyles = () => {
         marginStart: primitives.spacingMd,
         textAlign: 'left',
       },
-      safeArea: {
-        backgroundColor: semantics.backgroundCoreElevation1,
-        flex: 1,
-      },
       inlineButton: {
         borderColor: semantics.borderCoreDefault,
         borderTopWidth: 1,

package/src/components/Poll/components/__tests__/CreatePollHeader.test.tsx

@@ -43,39 +43,8 @@ const collectPathData = (node: unknown): string[] => {
   return [...(typeof props?.d === 'string' ? [props.d] : []), ...collectPathData(children)];
 };
 
-const collectTransforms = (node: unknown): string[] => {
-  if (!node || typeof node !== 'object') {
-    return [];
-  }
-
-  if (Array.isArray(node)) {
-    return node.reduce<string[]>((acc, child) => [...acc, ...collectTransforms(child)], []);
-  }
-
-  const { children, props } = node as {
-    children?: unknown;
-    props?: { style?: StyleProp<ViewStyle> };
-  };
-  const style = StyleSheet.flatten(props?.style);
-  const styleTransforms = Array.isArray(style?.transform)
-    ? style.transform.flatMap((transform) => {
-        if (
-          transform &&
-          typeof transform === 'object' &&
-          'rotate' in transform &&
-          typeof transform.rotate === 'string'
-        ) {
-          return [transform.rotate];
-        }
-        return [];
-      })
-    : [];
-
-  return [...styleTransforms, ...collectTransforms(children)];
-};
-
 describe('CreatePollHeader', () => {
-  it('renders a secondary ghost arrow-left close button', () => {
+  it('renders a secondary outline cross close button', () => {
     render(
       <ThemeProvider>
         <CreatePollHeader onBackPressHandler={jest.fn()} onCreatePollPressHandler={jest.fn()} />
@@ -84,11 +53,10 @@ describe('CreatePollHeader', () => {
 
     const style = getCloseButtonWrapperStyle();
     expect(style.backgroundColor).toBeUndefined();
-    expect(style.borderWidth).toBeUndefined();
-    expect(style.borderColor).toBeUndefined();
+    expect(style.borderWidth).toBe(1);
+    expect(style.borderColor).toBeDefined();
     expect(collectPathData(screen.toJSON())).toContain(
-      'M10 16.875V3.125M10 3.125L4.375 8.75M10 3.125L15.625 8.75',
+      'M15.625 4.375L4.375 15.625M15.625 15.625L4.375 4.375',
     );
-    expect(collectTransforms(screen.toJSON())).toContain('-90deg');
   });
 });

package/src/components/Poll/components/__tests__/PollModalHeader.test.tsx

@@ -47,41 +47,6 @@ const collectPathData = (node: unknown): string[] => {
   return [...(typeof props?.d === 'string' ? [props.d] : []), ...collectPathData(children)];
 };
 
-const collectTransforms = (node: unknown): string[] => {
-  if (!node || typeof node !== 'object') {
-    return [];
-  }
-
-  if (Array.isArray(node)) {
-    return node.reduce<string[]>((acc, child) => [...acc, ...collectTransforms(child)], []);
-  }
-
-  const { children, props } = node as {
-    children?: unknown;
-    props?: { style?: StyleProp<ViewStyle>; transform?: unknown };
-  };
-  const style = StyleSheet.flatten(props?.style);
-  const styleTransforms = Array.isArray(style?.transform)
-    ? style.transform.flatMap((transform) => {
-        if (
-          transform &&
-          typeof transform === 'object' &&
-          'rotate' in transform &&
-          typeof transform.rotate === 'string'
-        ) {
-          return [transform.rotate];
-        }
-        return [];
-      })
-    : [];
-
-  return [
-    ...(typeof props?.transform === 'string' ? [props.transform] : []),
-    ...styleTransforms,
-    ...collectTransforms(children),
-  ];
-};
-
 const renderPollModalHeader = () =>
   render(
     <ThemeProvider>
@@ -94,33 +59,31 @@ describe('PollModalHeader', () => {
     setPlatform(originalPlatform);
   });
 
-  it('renders a secondary ghost arrow-left button outside Android', () => {
+  it('renders a secondary outline cross button outside Android', () => {
     setPlatform('ios');
 
     renderPollModalHeader();
 
     const style = getCloseButtonWrapperStyle();
     expect(style.backgroundColor).toBeUndefined();
-    expect(style.borderWidth).toBeUndefined();
-    expect(style.borderColor).toBeUndefined();
+    expect(style.borderWidth).toBe(1);
+    expect(style.borderColor).toBeDefined();
     expect(collectPathData(screen.toJSON())).toContain(
-      'M10 16.875V3.125M10 3.125L4.375 8.75M10 3.125L15.625 8.75',
+      'M15.625 4.375L4.375 15.625M15.625 15.625L4.375 4.375',
     );
-    expect(collectTransforms(screen.toJSON())).toContain('-90deg');
   });
 
-  it('renders a secondary ghost arrow-left button on Android', () => {
+  it('renders a secondary outline cross button on Android', () => {
     setPlatform('android');
 
     renderPollModalHeader();
 
     const style = getCloseButtonWrapperStyle();
     expect(style.backgroundColor).toBeUndefined();
-    expect(style.borderWidth).toBeUndefined();
-    expect(style.borderColor).toBeUndefined();
+    expect(style.borderWidth).toBe(1);
+    expect(style.borderColor).toBeDefined();
     expect(collectPathData(screen.toJSON())).toContain(
-      'M10 16.875V3.125M10 3.125L4.375 8.75M10 3.125L15.625 8.75',
+      'M15.625 4.375L4.375 15.625M15.625 15.625L4.375 4.375',
     );
-    expect(collectTransforms(screen.toJSON())).toContain('-90deg');
   });
 });

package/src/components/Poll/components/index.ts

@@ -6,4 +6,5 @@ export * from './PollInputDialog';
 export * from './MultipleVotesSettings';
 export * from './PollOption';
 export * from './PollResults';
+export * from './PollModal';
 export * from './PollModalHeader';

package/src/components/Thread/__tests__/__snapshots__/Thread.test.tsx.snap

@@ -337,6 +337,7 @@ exports[`Thread should match thread snapshot 1`] = `
                     ],
                     {
                       "paddingHorizontal": 16,
+                      "paddingVertical": 8,
                     },
                   ]
                 }
@@ -370,7 +371,6 @@ exports[`Thread should match thread snapshot 1`] = `
                             "alignItems": "flex-end",
                             "flexDirection": "row",
                             "gap": 8,
-                            "paddingVertical": 8,
                             "width": "100%",
                           }
                         }
@@ -671,6 +671,7 @@ exports[`Thread should match thread snapshot 1`] = `
                     ],
                     {
                       "paddingHorizontal": 16,
+                      "paddingVertical": 8,
                     },
                   ]
                 }
@@ -704,7 +705,6 @@ exports[`Thread should match thread snapshot 1`] = `
                             "alignItems": "flex-end",
                             "flexDirection": "row",
                             "gap": 8,
-                            "paddingVertical": 8,
                             "width": "100%",
                           }
                         }
@@ -1039,6 +1039,7 @@ exports[`Thread should match thread snapshot 1`] = `
                     ],
                     {
                       "paddingHorizontal": 16,
+                      "paddingVertical": 8,
                     },
                   ]
                 }
@@ -1072,7 +1073,6 @@ exports[`Thread should match thread snapshot 1`] = `
                             "alignItems": "flex-end",
                             "flexDirection": "row",
                             "gap": 8,
-                            "paddingVertical": 8,
                             "width": "100%",
                           }
                         }
@@ -1365,7 +1365,9 @@ exports[`Thread should match thread snapshot 1`] = `
                   [
                     undefined,
                     {
+                      "marginBottom": 12,
                       "paddingHorizontal": 16,
+                      "paddingVertical": 8,
                     },
                   ]
                 }
@@ -1399,8 +1401,6 @@ exports[`Thread should match thread snapshot 1`] = `
                             "alignItems": "flex-end",
                             "flexDirection": "row",
                             "gap": 8,
-                            "marginBottom": 12,
-                            "paddingVertical": 8,
                             "width": "100%",
                           }
                         }

package/src/components/UIComponents/BottomSheetModal.tsx

@@ -48,7 +48,7 @@ import { useAccessibilityAnnouncer } from '../Accessibility/useAccessibilityAnno
 
 export type BottomSheetModalProps = {
   /**
-   * Function to call when the modal is closed.
+   * Function to call when the modal is closed or dismissed.
    * @returns void
    */
   onClose: () => void;
@@ -129,6 +129,14 @@ const BottomSheetModalInner = (props: PropsWithChildren<BottomSheetModalProps>)
   const wasVisibleRef = useRef(false);
 
   const [renderContent, setRenderContent] = useState(!lazy);
+  // We keep the underlying RN `<Modal>` mounted while it dismisses so we can
+  // listen for its `onDismiss` (iOS) and only then run the consumer's
+  // close-finished callback. Without this, callbacks that present another
+  // native modal (e.g. `UIImagePickerController` for camera capture) can race
+  // the still-dismissing view controller and crash with "Application tried to
+  // present modal view controller on top of itself" on iOS.
+  const [isDismissing, setIsDismissing] = useState(false);
+  const pendingCloseCallbackRef = useRef<(() => void) | undefined>(undefined);
 
   const showContent = useStableCallback(() => {
     if (lazy) {
@@ -166,15 +174,37 @@ const BottomSheetModalInner = (props: PropsWithChildren<BottomSheetModalProps>)
     );
   });
 
-  const finishClose = useStableCallback((closeAnimationFinishedCallback?: () => void) => {
+  const handleNativeModalDismiss = useStableCallback(() => {
+    const callback = pendingCloseCallbackRef.current;
+    pendingCloseCallbackRef.current = undefined;
     onClose();
-    if (closeAnimationFinishedCallback) {
-      Platform.OS === 'ios'
-        ? closeAnimationFinishedCallback()
-        : setTimeout(() => closeAnimationFinishedCallback(), 100);
-    }
+    callback?.();
   });
 
+  const finishClose = useStableCallback(
+    ({
+      closeAnimationFinishedCallback,
+      shouldDismiss,
+    }: {
+      closeAnimationFinishedCallback?: () => void;
+      shouldDismiss?: boolean;
+    }) => {
+      pendingCloseCallbackRef.current = closeAnimationFinishedCallback;
+      if (Platform.OS !== 'ios') {
+        // RN's `Modal.onDismiss` is iOS-only, so synthesize the same signal on
+        // other platforms after a short delay that gives the Dialog time to
+        // detach. Matches the previous Android behavior.
+        setTimeout(handleNativeModalDismiss, 100);
+      } else {
+        if (shouldDismiss) {
+          setIsDismissing(true);
+          return;
+        }
+        handleNativeModalDismiss();
+      }
+    },
+  );
+
   const closeFromGesture = useStableCallback(() => {
     requestAnimationFrame(() => {
       isOpen.value = false;
@@ -192,23 +222,39 @@ const BottomSheetModalInner = (props: PropsWithChildren<BottomSheetModalProps>)
     });
   });
 
-  const close = useStableCallback((closeAnimationFinishedCallback?: () => void) => {
-    if (!visible || !isOpen.value) {
-      return;
-    }
+  const closeInternal = useStableCallback(
+    ({
+      closeAnimationFinishedCallback,
+      shouldDismiss,
+    }: {
+      closeAnimationFinishedCallback?: () => void;
+      shouldDismiss?: boolean;
+    }) => {
+      if (!visible || !isOpen.value) {
+        return;
+      }
 
-    isOpen.value = false;
-    isOpening.value = false;
+      isOpen.value = false;
+      isOpening.value = false;
 
-    sheetTranslateY.value = withTiming(
-      maxHeight,
-      { duration: 250, easing: Easing.out(Easing.cubic) },
-      (finished) => {
-        if (finished) {
-          runOnJS(finishClose)(closeAnimationFinishedCallback);
-        }
-      },
-    );
+      sheetTranslateY.value = withTiming(
+        maxHeight,
+        { duration: 250, easing: Easing.out(Easing.cubic) },
+        (finished) => {
+          if (finished) {
+            runOnJS(finishClose)({ closeAnimationFinishedCallback, shouldDismiss });
+          }
+        },
+      );
+    },
+  );
+
+  const close = useStableCallback((closeAnimationFinishedCallback?: () => void) => {
+    closeInternal({ closeAnimationFinishedCallback });
+  });
+
+  const dismiss = useStableCallback((dismissFinishedCallback?: () => void) => {
+    closeInternal({ closeAnimationFinishedCallback: dismissFinishedCallback, shouldDismiss: true });
   });
 
   // modal opening layout effect - we make sure to only show the content
@@ -531,15 +577,21 @@ const BottomSheetModalInner = (props: PropsWithChildren<BottomSheetModalProps>)
 
   const bottomSheetModalContextValue = useMemo(
     () => ({
+      dismiss,
       close,
       currentSnapIndex,
       topSnapIndex,
     }),
-    [close, currentSnapIndex, topSnapIndex],
+    [dismiss, close, currentSnapIndex, topSnapIndex],
   );
 
   return (
-    <Modal onRequestClose={onClose} transparent visible={visible}>
+    <Modal
+      onDismiss={handleNativeModalDismiss}
+      onRequestClose={onClose}
+      transparent
+      visible={visible && !isDismissing}
+    >
       <GestureHandlerRootView style={styles.sheetContentContainer}>
         <View style={[styles.overlay, overlayTheme]}>
           <Animated.View