From af22df9d104c6dba393c74ff4b19c39720e2cce9 Mon Sep 17 00:00:00 2001
From: paufau <pakseev.1999@gmail.com>
Date: Wed, 2 Sep 2026 18:14:52 +0400
Subject: [PATCH] iOS: wait for dismissal animation to finish before hiding the
 window

---
 example/demo-components/src/DemoScreen.tsx                | 7 -------
 .../RNTModalMountingHelper/RNTModalMountingHelper.m       | 6 ++++--
 .../RNTModalViewController/RNTModalViewController.h       | 2 +-
 .../RNTModalViewController/RNTModalViewController.m       | 8 +++++++-
 4 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/example/demo-components/src/DemoScreen.tsx b/example/demo-components/src/DemoScreen.tsx
index 34dd2a4..21efac5 100644
--- a/example/demo-components/src/DemoScreen.tsx
+++ b/example/demo-components/src/DemoScreen.tsx
@@ -31,7 +31,6 @@ type DemoCase = {
 
 export const DemoScreen = () => {
   const { colors } = useTheme();
-  const { colors } = useTheme();
 
   const [activeCases, setActiveCases] = useState<DemoCase[]>([]);
 
@@ -180,22 +179,16 @@ export const DemoScreen = () => {
   return (
     <SafeAreaView
       style={[styles.safeArea, { backgroundColor: colors.background }]}
-    >
-      style={[styles.safeArea, { backgroundColor: colors.background }]}
     >
       <ScrollView
         style={styles.scroll}
         contentContainerStyle={styles.scrollContent}
-      >
-        <Typography testID='screen-top' style={styles.architecture}>
-        contentContainerStyle={styles.scrollContent}
       >
         <Typography testID='screen-top' style={styles.architecture}>
           Current Architecture: {IS_FABRIC ? 'Fabric 🚀' : 'Paper ✈️'}
         </Typography>
 
         <View style={styles.casesContainer}>
-          {demoCases.map(({ title, description, id }) => (
           {demoCases.map(({ title, description, id }) => (
             <ScenarioCard
               key={id}
diff --git a/ios/Library/RNTModalMountingHelper/RNTModalMountingHelper.m b/ios/Library/RNTModalMountingHelper/RNTModalMountingHelper.m
index 5d41ca5..68fb1ec 100644
--- a/ios/Library/RNTModalMountingHelper/RNTModalMountingHelper.m
+++ b/ios/Library/RNTModalMountingHelper/RNTModalMountingHelper.m
@@ -65,12 +65,14 @@ - (void)mount {
 }
 
 - (void)unmount {
-    [self.modal dismiss];
+    UIWindow *window = modalWindow;
+    [self.modal dismissWithCompletion:^{
+        window.hidden = YES;
+    }];
     self.modal = nil;
     self.isMounted = NO;
     self.hasProps = NO;
     self.hasChildren = NO;
-    modalWindow.hidden = YES;
     modalWindow = nil;
 }
 
diff --git a/ios/Library/RNTModalViewController/RNTModalViewController.h b/ios/Library/RNTModalViewController/RNTModalViewController.h
index 4a99f9e..58427f7 100644
--- a/ios/Library/RNTModalViewController/RNTModalViewController.h
+++ b/ios/Library/RNTModalViewController/RNTModalViewController.h
@@ -10,7 +10,7 @@
 
 @protocol RNTModalViewControllerProtocol <NSObject>
 - (void)presentOn:(UIViewController *)parentVC onView:(UIView *)parentView;
-- (void)dismiss;
+- (void)dismissWithCompletion:(void (^ _Nullable)(void))completion;
 - (void)addReactSubview:(UIView *)view;
 - (void)setupReactSubview:(UIView *)subview;
 - (void)setAnimationType:(NSString *)type;
diff --git a/ios/Library/RNTModalViewController/RNTModalViewController.m b/ios/Library/RNTModalViewController/RNTModalViewController.m
index a0a9c33..9b2dd83 100644
--- a/ios/Library/RNTModalViewController/RNTModalViewController.m
+++ b/ios/Library/RNTModalViewController/RNTModalViewController.m
@@ -67,7 +67,7 @@ - (void)presentOn:(UIViewController *)parentVC onView:(UIView *)parentView {
     [self didMoveToParentViewController:parentVC];
 }
 
-- (void)dismiss {
+- (void)dismissWithCompletion:(void (^ _Nullable)(void))completion {
     UIView *prevReactSubviewContainer = self.reactSubviewContainer;
     UIView *snapshot = [self.reactSubviewContainer snapshotViewAfterScreenUpdates:NO];
 
@@ -81,11 +81,17 @@ - (void)dismiss {
             [self willMoveToParentViewController:nil];
             [self.view removeFromSuperview];
             [self removeFromParentViewController];
+            if (completion) {
+                completion();
+            }
         }];
     } else {
         [self willMoveToParentViewController:nil];
         [self.view removeFromSuperview];
         [self removeFromParentViewController];
+        if (completion) {
+            completion();
+        }
     }
 }