From 4bac2c0a85eca7ac8b15cd3bbf55beed8b7f9317 Mon Sep 17 00:00:00 2001
From: Fabrizio Bertoglio <fabrizio.bertoglio@gmail.com>
Date: Thu, 25 Jan 2024 09:44:11 +0800
Subject: [PATCH 01/13] update readme

---
 README.md | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 2524bc9..b630881 100644
--- a/README.md
+++ b/README.md
@@ -1,8 +1,7 @@
 # react-native-improved
 
 
-- **Supports only react-native 0.73**.
-- Support for other versions will be added in the future ([#18](https://github.com/fabOnReact/react-native-improved/issues/18)).
+**Supports only react-native 0.73** ([#18](https://github.com/fabOnReact/react-native-improved/issues/18)).
 
 Provides different react-native iOS, Android and JS API fixes/PRs.
 

From 351f0d41125be74a5cd13eed81fe544f3adaa8aa Mon Sep 17 00:00:00 2001
From: Fabrizio Bertoglio <fabrizio.bertoglio@gmail.com>
Date: Thu, 25 Jan 2024 12:23:17 +0800
Subject: [PATCH 02/13] partial implementation of #31498

---
 .../RCTModalHostViewControllerImproved.h      | 16 ++++++++++++
 ios/Views/RCTModalHostViewImproved.h          | 13 +++++++---
 ...Improved.mm => RCTModalHostViewImproved.m} | 25 ++++++++++++++++---
 ...r.mm => RCTModalHostViewImprovedManager.m} |  7 ++++++
 4 files changed, 54 insertions(+), 7 deletions(-)
 create mode 100644 ios/Views/RCTModalHostViewControllerImproved.h
 rename ios/Views/{RCTModalHostViewImproved.mm => RCTModalHostViewImproved.m} (54%)
 rename ios/Views/{RCTModalHostViewImprovedManager.mm => RCTModalHostViewImprovedManager.m} (75%)

diff --git a/ios/Views/RCTModalHostViewControllerImproved.h b/ios/Views/RCTModalHostViewControllerImproved.h
new file mode 100644
index 0000000..3404390
--- /dev/null
+++ b/ios/Views/RCTModalHostViewControllerImproved.h
@@ -0,0 +1,16 @@
+/*
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#import <UIKit/UIKit.h>
+#import "RCTModalHostViewController.h"
+#import "RCTModalHostView.h"
+
+@interface RCTModalHostViewControllerImproved : RCTModalHostViewController
+
+@property RCTModalHostView* modalHostView;
+
+@end
diff --git a/ios/Views/RCTModalHostViewImproved.h b/ios/Views/RCTModalHostViewImproved.h
index 48fce62..9d831e8 100644
--- a/ios/Views/RCTModalHostViewImproved.h
+++ b/ios/Views/RCTModalHostViewImproved.h
@@ -7,6 +7,8 @@
 
 #import "RCTModalHostView.h"
 #import "RCTModalHostViewImproved.h"
+#import "RCTModalHostViewControllerImproved.h"
+#import "RCTModalHostViewController.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
@@ -15,17 +17,20 @@ NS_ASSUME_NONNULL_BEGIN
 @interface RCTModalHostViewImproved : RCTModalHostView
 
 @property (nonatomic, weak) id<RCTModalHostViewInteractorImproved> delegate;
+@property (nonatomic, strong) UIWindow *modalWindow;
+
+- (void)dismissModalViewControllerWithCompletion:(void (^)(void))completion;
 
 @end
 
 @protocol RCTModalHostViewInteractorImproved <NSObject>
 
-- (void)presentModalHostView:(RCTModalHostViewImproved *)modalHostView
-          withViewController:(RCTModalHostViewController *)viewController
-                    animated:(BOOL)animated;
-- (void)dismissModalHostView:(RCTModalHostViewImproved *)modalHostView
+- (void)dismissModalHostView:(RCTModalHostView *)modalHostView
           withViewController:(RCTModalHostViewController *)viewController
                     animated:(BOOL)animated;
+- (void)dismissModalHostViewWithCompletion:(RCTModalHostView *)modalHostView
+                        withViewController:(RCTModalHostViewController *)viewController
+                                  animated:(BOOL)animated completion: (void (^)(void))completion;
 
 @end
 
diff --git a/ios/Views/RCTModalHostViewImproved.mm b/ios/Views/RCTModalHostViewImproved.m
similarity index 54%
rename from ios/Views/RCTModalHostViewImproved.mm
rename to ios/Views/RCTModalHostViewImproved.m
index 96d3d21..b77b390 100644
--- a/ios/Views/RCTModalHostViewImproved.mm
+++ b/ios/Views/RCTModalHostViewImproved.m
@@ -11,7 +11,7 @@
 
 #import "RCTAssert.h"
 #import "RCTBridge.h"
-#import "RCTModalHostViewController.h"
+#import "RCTModalHostViewControllerImproved.h"
 #import "RCTTouchHandler.h"
 #import "RCTUIManager.h"
 #import "RCTUtils.h"
@@ -20,7 +20,7 @@
 @implementation RCTModalHostViewImproved {
   __weak RCTBridge *_bridge;
   BOOL _isPresented;
-  RCTModalHostViewController *_modalViewController;
+  RCTModalHostViewControllerImproved *_modalViewController;
   RCTTouchHandler *_touchHandler;
   UIView *_reactSubview;
   UIInterfaceOrientation _lastKnownOrientation;
@@ -32,10 +32,29 @@ @implementation RCTModalHostViewImproved {
 
 - (instancetype)initWithBridge:(RCTBridge *)bridge
 {
-  NSLog(@"RCTModalHostViewImproved init");
   self = [super initWithBridge:bridge];
+  _modalViewController.modalHostView = self;
 
   return self;
 }
 
+- (void)dismissModalViewController
+{
+  [self dismissModalViewControllerWithCompletion: nil];
+}
+
+- (void)dismissModalViewControllerWithCompletion:(void (^)(void))completion
+{
+  if (_isPresented) {
+    [self.delegate dismissModalHostView:self withViewController:_modalViewController animated:[self hasAnimationType]];
+    [self.delegate dismissModalHostViewWithCompletion:self withViewController:_modalViewController animated:[self hasAnimationType] completion: completion];
+    _isPresented = NO;
+  }
+}
+
+- (BOOL)hasAnimationType
+{
+  return ![self.animationType isEqualToString:@"none"];
+}
+
 @end
diff --git a/ios/Views/RCTModalHostViewImprovedManager.mm b/ios/Views/RCTModalHostViewImprovedManager.m
similarity index 75%
rename from ios/Views/RCTModalHostViewImprovedManager.mm
rename to ios/Views/RCTModalHostViewImprovedManager.m
index 4b210b1..c5416c2 100644
--- a/ios/Views/RCTModalHostViewImprovedManager.mm
+++ b/ios/Views/RCTModalHostViewImprovedManager.m
@@ -35,6 +35,13 @@ - (UIView *)view
   return view;
 }
 
+- (void)dismissModalHostViewWithCompletion:(RCTModalHostView *)modalHostView
+                        withViewController:(RCTModalHostViewController *)viewController
+                                  animated:(BOOL)animated completion:(void (^)(void))completion
+{
+  NSLog(@"dismissModalHostViewWithCompletion");
+}
+
 /* Over-ride this method to add custom shadow view
 - (RCTShadowView *)shadowView
 {

From 45e31a914b70ffdb17d28e47c21bb9a23f58289d Mon Sep 17 00:00:00 2001
From: Fabrizio Bertoglio <fabrizio.bertoglio@gmail.com>
Date: Thu, 25 Jan 2024 12:43:56 +0800
Subject: [PATCH 03/13] complete implementation of #31498

---
 .../RCTModalHostViewControllerImproved.h      |  4 +-
 ios/Views/RCTModalHostViewImproved.h          |  4 +-
 ios/Views/RCTModalHostViewImproved.m          |  2 -
 ios/Views/RCTModalHostViewImprovedManager.m   | 73 ++++++++++++++++++-
 4 files changed, 74 insertions(+), 9 deletions(-)

diff --git a/ios/Views/RCTModalHostViewControllerImproved.h b/ios/Views/RCTModalHostViewControllerImproved.h
index 3404390..2c39793 100644
--- a/ios/Views/RCTModalHostViewControllerImproved.h
+++ b/ios/Views/RCTModalHostViewControllerImproved.h
@@ -7,10 +7,10 @@
 
 #import <UIKit/UIKit.h>
 #import "RCTModalHostViewController.h"
-#import "RCTModalHostView.h"
+#import "RCTModalHostViewImproved.h"
 
 @interface RCTModalHostViewControllerImproved : RCTModalHostViewController
 
-@property RCTModalHostView* modalHostView;
+@property RCTModalHostViewImproved* modalHostView;
 
 @end
diff --git a/ios/Views/RCTModalHostViewImproved.h b/ios/Views/RCTModalHostViewImproved.h
index 9d831e8..18c332f 100644
--- a/ios/Views/RCTModalHostViewImproved.h
+++ b/ios/Views/RCTModalHostViewImproved.h
@@ -25,10 +25,10 @@ NS_ASSUME_NONNULL_BEGIN
 
 @protocol RCTModalHostViewInteractorImproved <NSObject>
 
-- (void)dismissModalHostView:(RCTModalHostView *)modalHostView
+- (void)dismissModalHostView:(RCTModalHostViewImproved *)modalHostView
           withViewController:(RCTModalHostViewController *)viewController
                     animated:(BOOL)animated;
-- (void)dismissModalHostViewWithCompletion:(RCTModalHostView *)modalHostView
+- (void)dismissModalHostViewWithCompletion:(RCTModalHostViewImproved *)modalHostView
                         withViewController:(RCTModalHostViewController *)viewController
                                   animated:(BOOL)animated completion: (void (^)(void))completion;
 
diff --git a/ios/Views/RCTModalHostViewImproved.m b/ios/Views/RCTModalHostViewImproved.m
index b77b390..59fd236 100644
--- a/ios/Views/RCTModalHostViewImproved.m
+++ b/ios/Views/RCTModalHostViewImproved.m
@@ -5,8 +5,6 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-#import "RCTModalHostViewImproved.h"
-
 #import <UIKit/UIKit.h>
 
 #import "RCTAssert.h"
diff --git a/ios/Views/RCTModalHostViewImprovedManager.m b/ios/Views/RCTModalHostViewImprovedManager.m
index c5416c2..4305146 100644
--- a/ios/Views/RCTModalHostViewImprovedManager.m
+++ b/ios/Views/RCTModalHostViewImprovedManager.m
@@ -6,8 +6,10 @@
 */
 
 #import "RCTModalHostViewImprovedManager.h"
+#import "RCTModalHostViewControllerImproved.h"
 #import "RCTModalHostViewImproved.h"
 #import "RCTShadowView.h"
+#import "RCTModalManager.h"
 
 @interface RCTModalHostShadowView : RCTShadowView
 
@@ -35,11 +37,76 @@ - (UIView *)view
   return view;
 }
 
-- (void)dismissModalHostViewWithCompletion:(RCTModalHostView *)modalHostView
-                        withViewController:(RCTModalHostViewController *)viewController
+- (void)presentModalHostView:(RCTModalHostViewImproved *)modalHostView
+          withViewController:(RCTModalHostViewController *)viewController
+                    animated:(BOOL)animated
+{
+  dispatch_block_t completionBlock = ^{
+    if (modalHostView.onShow) {
+      modalHostView.onShow(nil);
+    }
+  };
+  dispatch_async(dispatch_get_main_queue(), ^{
+    if (super.presentationBlock) {
+      super.presentationBlock([modalHostView reactViewController], viewController, animated, completionBlock);
+    } else {
+      UIViewController* presentingViewController;
+      // pageSheet and formSheet presentation style animate the presented view so we need to use the last presented view controller
+      // For other presentation styles we use the new window
+      if (modalHostView.presentationStyle == UIModalPresentationPageSheet || modalHostView.presentationStyle == UIModalPresentationFormSheet) {
+        UIViewController *lastPresentedViewController = RCTKeyWindow().rootViewController;
+        UIViewController *presentedViewController = nil;
+        while (lastPresentedViewController != nil) {
+          presentedViewController = lastPresentedViewController;
+          lastPresentedViewController = lastPresentedViewController.presentedViewController;
+        }
+        presentingViewController = presentedViewController;
+      } else {
+        modalHostView.modalWindow = [[UIWindow alloc] initWithFrame:UIScreen.mainScreen.bounds];
+        modalHostView.modalWindow.windowLevel = UIWindowLevelAlert;
+        UIViewController *newViewController = [[UIViewController alloc] init];
+        modalHostView.modalWindow.rootViewController = newViewController;
+        [modalHostView.modalWindow makeKeyAndVisible];
+        presentingViewController = newViewController;
+      }
+      [presentingViewController presentViewController:viewController animated:animated completion:completionBlock];
+    }
+  });
+}
+
+
+- (void)dismissModalHostViewWithCompletion:(RCTModalHostViewImproved *)modalHostView
+                        withViewController:(RCTModalHostViewControllerImproved *)viewController
                                   animated:(BOOL)animated completion:(void (^)(void))completion
 {
-  NSLog(@"dismissModalHostViewWithCompletion");
+  dispatch_block_t completionBlock = ^{
+    if (modalHostView.identifier) {
+      [[self.bridge moduleForClass:[RCTModalManager class]] modalDismissed:modalHostView.identifier];
+    }
+    if (completion) {
+      completion();
+    }
+    modalHostView.modalWindow = nil;
+  };
+  dispatch_async(dispatch_get_main_queue(), ^{
+    if (super.dismissalBlock) {
+      super.dismissalBlock([modalHostView reactViewController], viewController, animated, completionBlock);
+    } else {
+      // Will be true for pageSheet and formSheet presentation styles
+      // We dismiss the nested modal and then dismiss the current modal
+      if (viewController.presentedViewController != nil && [viewController.presentedViewController isKindOfClass:[RCTModalHostViewController class]]) {
+        RCTModalHostViewControllerImproved* presentedModalViewController = (RCTModalHostViewControllerImproved *)viewController.presentedViewController;
+        dispatch_block_t childModalCompletionBlock = ^{
+          [viewController.presentingViewController dismissViewControllerAnimated:animated completion:completionBlock];
+        };
+
+
+        [presentedModalViewController.modalHostView dismissModalViewControllerWithCompletion: childModalCompletionBlock];
+      } else {
+        [viewController.presentingViewController dismissViewControllerAnimated:animated completion:completionBlock];
+      }
+    }
+  });
 }
 
 /* Over-ride this method to add custom shadow view

From 4f39a2c2be991893e8955b4e6efc750432b376ff Mon Sep 17 00:00:00 2001
From: Fabrizio Bertoglio <fabrizio.bertoglio@gmail.com>
Date: Thu, 25 Jan 2024 12:54:31 +0800
Subject: [PATCH 04/13] adding dismissModalHostView

---
 ios/Views/RCTModalHostViewImprovedManager.m | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/ios/Views/RCTModalHostViewImprovedManager.m b/ios/Views/RCTModalHostViewImprovedManager.m
index 4305146..e27bc3b 100644
--- a/ios/Views/RCTModalHostViewImprovedManager.m
+++ b/ios/Views/RCTModalHostViewImprovedManager.m
@@ -109,11 +109,16 @@ - (void)dismissModalHostViewWithCompletion:(RCTModalHostViewImproved *)modalHost
   });
 }
 
-/* Over-ride this method to add custom shadow view
-- (RCTShadowView *)shadowView
+- (void)dismissModalHostView:(RCTModalHostView *)modalHostView
+          withViewController:(RCTModalHostViewController *)viewController
+                    animated:(BOOL)animated
 {
-  return [RCTModalHostShadowView new];
+  [self dismissModalHostViewWithCompletion:modalHostView withViewController:viewController animated:animated completion:nil];
 }
-*/
 
+// Over-ride this method to add custom shadow view
+// - (RCTShadowView *)shadowView
+// {
+//  return [RCTModalHostShadowView new];
+// }
 @end

From c5f4d6833815647a693b72ed9f8441402861daff Mon Sep 17 00:00:00 2001
From: Fabrizio Bertoglio <fabrizio.bertoglio@gmail.com>
Date: Thu, 25 Jan 2024 13:57:23 +0800
Subject: [PATCH 05/13] minor changes

---
 ios/Views/RCTModalHostViewImproved.m | 1 -
 1 file changed, 1 deletion(-)

diff --git a/ios/Views/RCTModalHostViewImproved.m b/ios/Views/RCTModalHostViewImproved.m
index 59fd236..be37c6e 100644
--- a/ios/Views/RCTModalHostViewImproved.m
+++ b/ios/Views/RCTModalHostViewImproved.m
@@ -44,7 +44,6 @@ - (void)dismissModalViewController
 - (void)dismissModalViewControllerWithCompletion:(void (^)(void))completion
 {
   if (_isPresented) {
-    [self.delegate dismissModalHostView:self withViewController:_modalViewController animated:[self hasAnimationType]];
     [self.delegate dismissModalHostViewWithCompletion:self withViewController:_modalViewController animated:[self hasAnimationType] completion: completion];
     _isPresented = NO;
   }

From 637647059acb84b1110da72df4c5445c06be9f4b Mon Sep 17 00:00:00 2001
From: Fabrizio Bertoglio <fabrizio.bertoglio@gmail.com>
Date: Thu, 25 Jan 2024 16:31:13 +0800
Subject: [PATCH 06/13] fixing issue with modal not closing

---
 ios/Views/RCTModalHostViewImproved.h |  3 +++
 ios/Views/RCTModalHostViewImproved.m | 29 ++++++++++++++++++++++++++++
 2 files changed, 32 insertions(+)

diff --git a/ios/Views/RCTModalHostViewImproved.h b/ios/Views/RCTModalHostViewImproved.h
index 18c332f..59d5f88 100644
--- a/ios/Views/RCTModalHostViewImproved.h
+++ b/ios/Views/RCTModalHostViewImproved.h
@@ -25,6 +25,9 @@ NS_ASSUME_NONNULL_BEGIN
 
 @protocol RCTModalHostViewInteractorImproved <NSObject>
 
+- (void)presentModalHostView:(RCTModalHostView *)modalHostView
+          withViewController:(RCTModalHostViewController *)viewController
+                    animated:(BOOL)animated;
 - (void)dismissModalHostView:(RCTModalHostViewImproved *)modalHostView
           withViewController:(RCTModalHostViewController *)viewController
                     animated:(BOOL)animated;
diff --git a/ios/Views/RCTModalHostViewImproved.m b/ios/Views/RCTModalHostViewImproved.m
index be37c6e..62be52f 100644
--- a/ios/Views/RCTModalHostViewImproved.m
+++ b/ios/Views/RCTModalHostViewImproved.m
@@ -10,6 +10,7 @@
 #import "RCTAssert.h"
 #import "RCTBridge.h"
 #import "RCTModalHostViewControllerImproved.h"
+#import "RCTModalHostView.h"
 #import "RCTTouchHandler.h"
 #import "RCTUIManager.h"
 #import "RCTUtils.h"
@@ -49,6 +50,34 @@ - (void)dismissModalViewControllerWithCompletion:(void (^)(void))completion
   }
 }
 
+
+- (void)setVisible:(BOOL)visible
+{
+  [super setVisible:visible];
+  BOOL shouldBePresented = !_isPresented && self.visible && self.window;
+  if (shouldBePresented) {
+    _isPresented = YES;
+  }
+}
+
+- (void)didMoveToWindow
+{
+  [super didMoveToWindow];
+  BOOL shouldBePresented = !_isPresented && self.visible && self.window;
+  if (shouldBePresented) {
+    _isPresented = YES;
+  }
+}
+
+- (void)didMoveToSuperview
+{
+  [super didMoveToSuperview];
+  BOOL shouldBePresented = !_isPresented && self.visible && self.window;
+  if (shouldBePresented) {
+    _isPresented = YES;
+  }
+}
+
 - (BOOL)hasAnimationType
 {
   return ![self.animationType isEqualToString:@"none"];

From 7de9cb1f6d95ce148293e34cba56b457d98aefa4 Mon Sep 17 00:00:00 2001
From: Fabrizio Bertoglio <fabrizio.bertoglio@gmail.com>
Date: Thu, 25 Jan 2024 16:35:24 +0800
Subject: [PATCH 07/13] minor changes

---
 ios/Views/RCTModalHostViewImprovedManager.m | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/ios/Views/RCTModalHostViewImprovedManager.m b/ios/Views/RCTModalHostViewImprovedManager.m
index e27bc3b..8d3090f 100644
--- a/ios/Views/RCTModalHostViewImprovedManager.m
+++ b/ios/Views/RCTModalHostViewImprovedManager.m
@@ -116,9 +116,13 @@ - (void)dismissModalHostView:(RCTModalHostView *)modalHostView
   [self dismissModalHostViewWithCompletion:modalHostView withViewController:viewController animated:animated completion:nil];
 }
 
-// Over-ride this method to add custom shadow view
-// - (RCTShadowView *)shadowView
-// {
-//  return [RCTModalHostShadowView new];
-// }
+/**
+Over-ride this method to add change the React Native Shadow View for this class.
+
+- (RCTShadowView *)shadowView
+{
+ return [RCTModalHostShadowViewImproved new];
+}
+**/
+
 @end

From 4032065cae24d08b150e3b9d8fc5f2403e7b47c4 Mon Sep 17 00:00:00 2001
From: Fabrizio Bertoglio <fabrizio.bertoglio@gmail.com>
Date: Fri, 26 Jan 2024 16:54:04 +0800
Subject: [PATCH 08/13] remove PR diff - modal opens and closes

---
 .../src/examples/Modal/ModalPresentation.js   | 242 ++----------------
 .../RCTModalHostViewControllerImproved.h      |   2 -
 .../RCTModalHostViewControllerImproved.m      |  35 +++
 ios/Views/RCTModalHostViewImproved.m          |  55 +---
 ios/Views/RCTModalHostViewImprovedManager.m   |  79 ------
 5 files changed, 66 insertions(+), 347 deletions(-)
 create mode 100644 ios/Views/RCTModalHostViewControllerImproved.m

diff --git a/example/src/examples/Modal/ModalPresentation.js b/example/src/examples/Modal/ModalPresentation.js
index 358da02..7d46167 100644
--- a/example/src/examples/Modal/ModalPresentation.js
+++ b/example/src/examples/Modal/ModalPresentation.js
@@ -11,9 +11,17 @@
 /* eslint-disable no-alert */
 
 import * as React from 'react';
-import {Modal, Platform, StyleSheet, Switch, Text, View} from 'react-native';
-import type {RNTesterModuleExample} from '../../types/RNTesterTypes';
-import type {Props as ModalProps} from 'react-native/Libraries/Modal/Modal';
+import {
+  Button,
+  Modal,
+  Platform,
+  StyleSheet,
+  Switch,
+  Text,
+  View,
+} from 'react-native';
+import type { RNTesterModuleExample } from '../../types/RNTesterTypes';
+import type { Props as ModalProps } from 'react-native/Libraries/Modal/Modal';
 import RNTOption from '../../components/RNTOption';
 const RNTesterButton = require('../../components/RNTesterButton');
 
@@ -33,229 +41,17 @@ const supportedOrientations = [
 ];
 
 function ModalPresentation() {
-  const onDismiss = React.useCallback(() => {
-    alert('onDismiss');
-  }, []);
-
-  const onShow = React.useCallback(() => {
-    alert('onShow');
-  }, []);
-
-  const onRequestClose = React.useCallback(() => {
-    console.log('onRequestClose');
-  }, []);
-
-  const [props, setProps] = React.useState<ModalProps>({
-    animationType: 'none',
-    transparent: false,
-    hardwareAccelerated: false,
-    statusBarTranslucent: false,
-    presentationStyle: Platform.select({
-      ios: 'fullScreen',
-      default: undefined,
-    }),
-    supportedOrientations: Platform.select({
-      ios: ['portrait'],
-      default: undefined,
-    }),
-    onDismiss: undefined,
-    onShow: undefined,
-    visible: false,
-  });
-  const presentationStyle = props.presentationStyle;
-  const hardwareAccelerated = props.hardwareAccelerated;
-  const statusBarTranslucent = props.statusBarTranslucent;
-
-  const [currentOrientation, setCurrentOrientation] = React.useState('unknown');
-
-  /* $FlowFixMe[missing-local-annot] The type annotation(s) required by Flow's
-   * LTI update could not be added via codemod */
-  const onOrientationChange = event =>
-    setCurrentOrientation(event.nativeEvent.orientation);
-
-  const controls = (
-    <>
-      <View style={styles.inlineBlock}>
-        <Text style={styles.title}>Status Bar Translucent 🟢</Text>
-        <Switch
-          value={statusBarTranslucent}
-          onValueChange={enabled =>
-            setProps(prev => ({...prev, statusBarTranslucent: enabled}))
-          }
-        />
-      </View>
-      <View style={styles.inlineBlock}>
-        <Text style={styles.title}>Hardware Acceleration 🟢</Text>
-        <Switch
-          value={hardwareAccelerated}
-          onValueChange={enabled =>
-            setProps(prev => ({
-              ...prev,
-              hardwareAccelerated: enabled,
-            }))
-          }
-        />
-      </View>
-      <View style={styles.block}>
-        <Text style={styles.title}>Presentation Style ⚫️</Text>
-        <View style={styles.row}>
-          {presentationStyles.map(type => (
-            <RNTOption
-              key={type}
-              disabled={Platform.OS !== 'ios'}
-              style={styles.option}
-              label={type}
-              multiSelect={true}
-              onPress={() =>
-                setProps(prev => {
-                  if (type === 'overFullScreen' && prev.transparent === true) {
-                    return {
-                      ...prev,
-                      presentationStyle: type,
-                      transparent: false,
-                    };
-                  }
-                  return {
-                    ...prev,
-                    presentationStyle:
-                      type === prev.presentationStyle ? undefined : type,
-                  };
-                })
-              }
-              selected={type === presentationStyle}
-            />
-          ))}
-        </View>
-      </View>
-      <View style={styles.block}>
-        <View style={styles.rowWithSpaceBetween}>
-          <Text style={styles.title}>Transparent</Text>
-          <Switch
-            value={props.transparent}
-            onValueChange={enabled =>
-              setProps(prev => ({...prev, transparent: enabled}))
-            }
-          />
-        </View>
-        {Platform.OS === 'ios' && presentationStyle !== 'overFullScreen' ? (
-          <Text style={styles.warning}>
-            iOS Modal can only be transparent with 'overFullScreen' Presentation
-            Style
-          </Text>
-        ) : null}
-      </View>
-      <View style={styles.block}>
-        <Text style={styles.title}>Supported Orientation ⚫️</Text>
-        <View style={styles.row}>
-          {supportedOrientations.map(orientation => (
-            <RNTOption
-              key={orientation}
-              disabled={Platform.OS !== 'ios'}
-              style={styles.option}
-              label={orientation}
-              multiSelect={true}
-              onPress={() =>
-                setProps(prev => {
-                  if (prev.supportedOrientations?.includes(orientation)) {
-                    return {
-                      ...prev,
-                      supportedOrientations: prev.supportedOrientations?.filter(
-                        o => o !== orientation,
-                      ),
-                    };
-                  }
-                  return {
-                    ...prev,
-                    supportedOrientations: [
-                      ...(prev.supportedOrientations ?? []),
-                      orientation,
-                    ],
-                  };
-                })
-              }
-              selected={props.supportedOrientations?.includes(orientation)}
-            />
-          ))}
-        </View>
-      </View>
-      <View style={styles.block}>
-        <Text style={styles.title}>Actions</Text>
-        <View style={styles.row}>
-          <RNTOption
-            key="onShow"
-            style={styles.option}
-            label="onShow"
-            multiSelect={true}
-            onPress={() =>
-              setProps(prev => ({
-                ...prev,
-                onShow: prev.onShow ? undefined : onShow,
-              }))
-            }
-            selected={!!props.onShow}
-          />
-          <RNTOption
-            key="onDismiss"
-            style={styles.option}
-            label="onDismiss ⚫️"
-            disabled={Platform.OS !== 'ios'}
-            onPress={() =>
-              setProps(prev => ({
-                ...prev,
-                onDismiss: prev.onDismiss ? undefined : onDismiss,
-              }))
-            }
-            selected={!!props.onDismiss}
-          />
-        </View>
-      </View>
-    </>
-  );
-
+  const [firstModalVisible, setFirstModalVisible] = React.useState(true);
+  const [secondModalVisible, setSecondModalVisible] = React.useState(true);
   return (
     <View>
-      <RNTesterButton
-        onPress={() => setProps(prev => ({...prev, visible: true}))}>
-        Show Modal
-      </RNTesterButton>
-      <Modal
-        {...props}
-        onRequestClose={onRequestClose}
-        onOrientationChange={onOrientationChange}>
-        <View style={styles.modalContainer}>
-          <View style={styles.modalInnerContainer}>
-            <Text testID="modal_animationType_text">
-              This modal was presented with animationType: '
-              {props.animationType}'
-            </Text>
-            {Platform.OS === 'ios' ? (
-              <Text>
-                It is currently displayed in {currentOrientation} mode.
-              </Text>
-            ) : null}
-            <RNTesterButton
-              onPress={() => setProps(prev => ({...prev, visible: false}))}>
-              Close
-            </RNTesterButton>
-            {controls}
-          </View>
-        </View>
+      <Modal visible={firstModalVisible} presentationStyle="pageSheet">
+        <Text>This is first modal</Text>
+        <Button
+          title="dismiss first modal"
+          onPress={() => setFirstModalVisible(false)}
+        />
       </Modal>
-      <View style={styles.block}>
-        <Text style={styles.title}>Animation Type</Text>
-        <View style={styles.row}>
-          {animationTypes.map(type => (
-            <RNTOption
-              key={type}
-              style={styles.option}
-              label={type}
-              onPress={() => setProps(prev => ({...prev, animationType: type}))}
-              selected={type === props.animationType}
-            />
-          ))}
-        </View>
-      </View>
-      {controls}
     </View>
   );
 }
diff --git a/ios/Views/RCTModalHostViewControllerImproved.h b/ios/Views/RCTModalHostViewControllerImproved.h
index 2c39793..7b4de29 100644
--- a/ios/Views/RCTModalHostViewControllerImproved.h
+++ b/ios/Views/RCTModalHostViewControllerImproved.h
@@ -11,6 +11,4 @@
 
 @interface RCTModalHostViewControllerImproved : RCTModalHostViewController
 
-@property RCTModalHostViewImproved* modalHostView;
-
 @end
diff --git a/ios/Views/RCTModalHostViewControllerImproved.m b/ios/Views/RCTModalHostViewControllerImproved.m
new file mode 100644
index 0000000..745cd8b
--- /dev/null
+++ b/ios/Views/RCTModalHostViewControllerImproved.m
@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#import "RCTModalHostViewControllerImproved.h"
+
+#import "RCTLog.h"
+#import "RCTModalHostView.h"
+
+@implementation RCTModalHostViewControllerImproved {
+  CGRect _lastViewFrame;
+  UIStatusBarStyle _preferredStatusBarStyle;
+  BOOL _preferredStatusBarHidden;
+}
+
+- (instancetype)init
+{
+  if (!(self = [super init])) {
+    return nil;
+  }
+
+  self.modalInPresentation = YES;
+
+  // _preferredStatusBarStyle = [RCTSharedApplication() statusBarStyle];
+  // _preferredStatusBarHidden = [RCTSharedApplication() isStatusBarHidden];
+
+  return self;
+}
+
+
+@end
+
diff --git a/ios/Views/RCTModalHostViewImproved.m b/ios/Views/RCTModalHostViewImproved.m
index 62be52f..619eb8f 100644
--- a/ios/Views/RCTModalHostViewImproved.m
+++ b/ios/Views/RCTModalHostViewImproved.m
@@ -32,55 +32,24 @@ @implementation RCTModalHostViewImproved {
 - (instancetype)initWithBridge:(RCTBridge *)bridge
 {
   self = [super initWithBridge:bridge];
-  _modalViewController.modalHostView = self;
+  _modalViewController = [RCTModalHostViewControllerImproved new];
+  UIView *containerView = [UIView new];
+  containerView.autoresizingMask = UIViewAutoresizingFlexibleHeight | UIViewAutoresizingFlexibleWidth;
+  _modalViewController.view = containerView;
+  _touchHandler = [[RCTTouchHandler alloc] initWithBridge:bridge];
+  _isPresented = NO;
 
   return self;
 }
 
+/*
 - (void)dismissModalViewController
 {
-  [self dismissModalViewControllerWithCompletion: nil];
-}
-
-- (void)dismissModalViewControllerWithCompletion:(void (^)(void))completion
-{
-  if (_isPresented) {
-    [self.delegate dismissModalHostViewWithCompletion:self withViewController:_modalViewController animated:[self hasAnimationType] completion: completion];
-    _isPresented = NO;
-  }
-}
-
-
-- (void)setVisible:(BOOL)visible
-{
-  [super setVisible:visible];
-  BOOL shouldBePresented = !_isPresented && self.visible && self.window;
-  if (shouldBePresented) {
-    _isPresented = YES;
-  }
-}
-
-- (void)didMoveToWindow
-{
-  [super didMoveToWindow];
-  BOOL shouldBePresented = !_isPresented && self.visible && self.window;
-  if (shouldBePresented) {
-    _isPresented = YES;
-  }
-}
-
-- (void)didMoveToSuperview
-{
-  [super didMoveToSuperview];
-  BOOL shouldBePresented = !_isPresented && self.visible && self.window;
-  if (shouldBePresented) {
-    _isPresented = YES;
-  }
-}
-
-- (BOOL)hasAnimationType
-{
-  return ![self.animationType isEqualToString:@"none"];
+ if (_isPresented) {
+ [_delegate dismissModalHostView:self withViewController:_modalViewController animated:[self hasAnimationType]];
+ _isPresented = NO;
+ }
 }
+*/
 
 @end
diff --git a/ios/Views/RCTModalHostViewImprovedManager.m b/ios/Views/RCTModalHostViewImprovedManager.m
index 8d3090f..c261f62 100644
--- a/ios/Views/RCTModalHostViewImprovedManager.m
+++ b/ios/Views/RCTModalHostViewImprovedManager.m
@@ -37,85 +37,6 @@ - (UIView *)view
   return view;
 }
 
-- (void)presentModalHostView:(RCTModalHostViewImproved *)modalHostView
-          withViewController:(RCTModalHostViewController *)viewController
-                    animated:(BOOL)animated
-{
-  dispatch_block_t completionBlock = ^{
-    if (modalHostView.onShow) {
-      modalHostView.onShow(nil);
-    }
-  };
-  dispatch_async(dispatch_get_main_queue(), ^{
-    if (super.presentationBlock) {
-      super.presentationBlock([modalHostView reactViewController], viewController, animated, completionBlock);
-    } else {
-      UIViewController* presentingViewController;
-      // pageSheet and formSheet presentation style animate the presented view so we need to use the last presented view controller
-      // For other presentation styles we use the new window
-      if (modalHostView.presentationStyle == UIModalPresentationPageSheet || modalHostView.presentationStyle == UIModalPresentationFormSheet) {
-        UIViewController *lastPresentedViewController = RCTKeyWindow().rootViewController;
-        UIViewController *presentedViewController = nil;
-        while (lastPresentedViewController != nil) {
-          presentedViewController = lastPresentedViewController;
-          lastPresentedViewController = lastPresentedViewController.presentedViewController;
-        }
-        presentingViewController = presentedViewController;
-      } else {
-        modalHostView.modalWindow = [[UIWindow alloc] initWithFrame:UIScreen.mainScreen.bounds];
-        modalHostView.modalWindow.windowLevel = UIWindowLevelAlert;
-        UIViewController *newViewController = [[UIViewController alloc] init];
-        modalHostView.modalWindow.rootViewController = newViewController;
-        [modalHostView.modalWindow makeKeyAndVisible];
-        presentingViewController = newViewController;
-      }
-      [presentingViewController presentViewController:viewController animated:animated completion:completionBlock];
-    }
-  });
-}
-
-
-- (void)dismissModalHostViewWithCompletion:(RCTModalHostViewImproved *)modalHostView
-                        withViewController:(RCTModalHostViewControllerImproved *)viewController
-                                  animated:(BOOL)animated completion:(void (^)(void))completion
-{
-  dispatch_block_t completionBlock = ^{
-    if (modalHostView.identifier) {
-      [[self.bridge moduleForClass:[RCTModalManager class]] modalDismissed:modalHostView.identifier];
-    }
-    if (completion) {
-      completion();
-    }
-    modalHostView.modalWindow = nil;
-  };
-  dispatch_async(dispatch_get_main_queue(), ^{
-    if (super.dismissalBlock) {
-      super.dismissalBlock([modalHostView reactViewController], viewController, animated, completionBlock);
-    } else {
-      // Will be true for pageSheet and formSheet presentation styles
-      // We dismiss the nested modal and then dismiss the current modal
-      if (viewController.presentedViewController != nil && [viewController.presentedViewController isKindOfClass:[RCTModalHostViewController class]]) {
-        RCTModalHostViewControllerImproved* presentedModalViewController = (RCTModalHostViewControllerImproved *)viewController.presentedViewController;
-        dispatch_block_t childModalCompletionBlock = ^{
-          [viewController.presentingViewController dismissViewControllerAnimated:animated completion:completionBlock];
-        };
-
-
-        [presentedModalViewController.modalHostView dismissModalViewControllerWithCompletion: childModalCompletionBlock];
-      } else {
-        [viewController.presentingViewController dismissViewControllerAnimated:animated completion:completionBlock];
-      }
-    }
-  });
-}
-
-- (void)dismissModalHostView:(RCTModalHostView *)modalHostView
-          withViewController:(RCTModalHostViewController *)viewController
-                    animated:(BOOL)animated
-{
-  [self dismissModalHostViewWithCompletion:modalHostView withViewController:viewController animated:animated completion:nil];
-}
-
 /**
 Over-ride this method to add change the React Native Shadow View for this class.
 

From 970ade3a356a8c0492ac7eff4ffb940229367675 Mon Sep 17 00:00:00 2001
From: Fabrizio Bertoglio <fabrizio.bertoglio@gmail.com>
Date: Sun, 28 Jan 2024 14:44:35 +0800
Subject: [PATCH 09/13] dummy impl ensurePresentedOnlyIfNeeded and
 dismissModalViewController

---
 example/ios/Podfile.lock                    |  4 +--
 ios/Views/RCTModalHostViewImproved.m        | 34 ++++++++++++++++-----
 ios/Views/RCTModalHostViewImprovedManager.m | 28 +++++++++++++++++
 3 files changed, 56 insertions(+), 10 deletions(-)

diff --git a/example/ios/Podfile.lock b/example/ios/Podfile.lock
index eb09f99..8e70739 100644
--- a/example/ios/Podfile.lock
+++ b/example/ios/Podfile.lock
@@ -944,7 +944,7 @@ PODS:
   - React-Mapbuffer (0.73.0):
     - glog
     - React-debug
-  - react-native-improved (0.2.7):
+  - react-native-improved (0.2.8):
     - glog
     - RCT-Folly (= 2022.05.16.00)
     - React-Core
@@ -1351,7 +1351,7 @@ SPEC CHECKSUMS:
   React-jsinspector: 9f6fb9ed9f03a0fb961ab8dc2e0e0ee0dc729e77
   React-logger: 008caec0d6a587abc1e71be21bfac5ba1662fe6a
   React-Mapbuffer: 58fe558faf52ecde6705376700f848d0293d1cef
-  react-native-improved: 82e8e1912f5858a2ef60e56bb79ecba011fff0b2
+  react-native-improved: a79262806efea7f6fe5d51f1879f7faa730edaca
   React-nativeconfig: a063483672b8add47a4875b0281e202908ff6747
   React-NativeModulesApple: 169506a5fd708ab22811f76ee06a976595c367a1
   React-perflogger: b61e5db8e5167f5e70366e820766c492847c082e
diff --git a/ios/Views/RCTModalHostViewImproved.m b/ios/Views/RCTModalHostViewImproved.m
index 619eb8f..50222fa 100644
--- a/ios/Views/RCTModalHostViewImproved.m
+++ b/ios/Views/RCTModalHostViewImproved.m
@@ -19,7 +19,7 @@
 @implementation RCTModalHostViewImproved {
   __weak RCTBridge *_bridge;
   BOOL _isPresented;
-  RCTModalHostViewControllerImproved *_modalViewController;
+  RCTModalHostViewController *_modalViewController;
   RCTTouchHandler *_touchHandler;
   UIView *_reactSubview;
   UIInterfaceOrientation _lastKnownOrientation;
@@ -32,7 +32,7 @@ @implementation RCTModalHostViewImproved {
 - (instancetype)initWithBridge:(RCTBridge *)bridge
 {
   self = [super initWithBridge:bridge];
-  _modalViewController = [RCTModalHostViewControllerImproved new];
+  _modalViewController = [RCTModalHostViewController new];
   UIView *containerView = [UIView new];
   containerView.autoresizingMask = UIViewAutoresizingFlexibleHeight | UIViewAutoresizingFlexibleWidth;
   _modalViewController.view = containerView;
@@ -42,14 +42,32 @@ - (instancetype)initWithBridge:(RCTBridge *)bridge
   return self;
 }
 
-/*
+- (void)ensurePresentedOnlyIfNeeded
+{
+  BOOL shouldBePresented = !_isPresented && super.visible && self.window;
+  if (shouldBePresented) {
+    RCTAssert(self.reactViewController, @"Can't present modal view controller without a presenting view controller");
+
+    [self.delegate presentModalHostView:self withViewController:_modalViewController animated:[self hasAnimationType]];
+    _isPresented = YES;
+  }
+
+  BOOL shouldBeHidden = _isPresented && (!super.visible || !self.superview);
+  if (shouldBeHidden) {
+    [self dismissModalViewController];
+  }
+}
+
 - (void)dismissModalViewController
 {
- if (_isPresented) {
- [_delegate dismissModalHostView:self withViewController:_modalViewController animated:[self hasAnimationType]];
- _isPresented = NO;
- }
+  if (_isPresented) {
+    [self.delegate dismissModalHostView:self withViewController:_modalViewController animated:[self hasAnimationType]];
+    _isPresented = NO;
+  }
 }
-*/
 
+- (BOOL)hasAnimationType
+{
+  return ![self.animationType isEqualToString:@"none"];
+}
 @end
diff --git a/ios/Views/RCTModalHostViewImprovedManager.m b/ios/Views/RCTModalHostViewImprovedManager.m
index c261f62..e5d08b6 100644
--- a/ios/Views/RCTModalHostViewImprovedManager.m
+++ b/ios/Views/RCTModalHostViewImprovedManager.m
@@ -37,6 +37,34 @@ - (UIView *)view
   return view;
 }
 
+- (void)presentModalHostView:(RCTModalHostViewImproved *)modalHostView
+          withViewController:(RCTModalHostViewControllerImproved *)viewController
+                    animated:(BOOL)animated
+{
+  dispatch_block_t completionBlock = ^{
+    if (modalHostView.onShow) {
+      modalHostView.onShow(nil);
+    }
+  };
+  [[modalHostView reactViewController] presentViewController:viewController
+                                                        animated:animated
+                                                      completion:completionBlock];
+}
+
+- (void)dismissModalHostView:(RCTModalHostViewImproved *)modalHostView
+          withViewController:(RCTModalHostViewControllerImproved *)viewController
+                    animated:(BOOL)animated
+{
+  dispatch_block_t completionBlock = ^{
+    if (modalHostView.identifier) {
+      [[self.bridge moduleForClass:[RCTModalManager class]] modalDismissed:modalHostView.identifier];
+    }
+  };
+  [[modalHostView reactViewController] presentViewController:viewController
+                                                    animated:animated
+                                                  completion:completionBlock];
+}
+
 /**
 Over-ride this method to add change the React Native Shadow View for this class.
 

From 0b8de3c8e326ff3073d6e5def529b3c253072551 Mon Sep 17 00:00:00 2001
From: Fabrizio Bertoglio <fabrizio.bertoglio@gmail.com>
Date: Sun, 28 Jan 2024 15:37:56 +0800
Subject: [PATCH 10/13] working touch handler and dismiss

---
 .../src/examples/Modal/ModalPresentation.js   | 19 ++++++-
 ios/Views/RCTModalHostViewImproved.m          | 57 +++++++++++++++++++
 ios/Views/RCTModalHostViewImprovedManager.m   | 40 ++++++++++---
 3 files changed, 108 insertions(+), 8 deletions(-)

diff --git a/example/src/examples/Modal/ModalPresentation.js b/example/src/examples/Modal/ModalPresentation.js
index 7d46167..b145746 100644
--- a/example/src/examples/Modal/ModalPresentation.js
+++ b/example/src/examples/Modal/ModalPresentation.js
@@ -12,6 +12,7 @@
 
 import * as React from 'react';
 import {
+  TouchableOpacity,
   Button,
   Modal,
   Platform,
@@ -49,8 +50,24 @@ function ModalPresentation() {
         <Text>This is first modal</Text>
         <Button
           title="dismiss first modal"
-          onPress={() => setFirstModalVisible(false)}
+          onPress={() => {
+            console.log('press button');
+            setFirstModalVisible(false);
+          }}
         />
+        <TouchableOpacity
+          onPress={() => console.log('touchable')}
+          style={{
+            backgroundColor: 'yellow',
+            height: 100,
+            width: 400,
+            borderWidth: 1,
+          }}
+        >
+    <Text>
+    Press ME
+    </Text>
+        </TouchableOpacity>
       </Modal>
     </View>
   );
diff --git a/ios/Views/RCTModalHostViewImproved.m b/ios/Views/RCTModalHostViewImproved.m
index 50222fa..2fdfe39 100644
--- a/ios/Views/RCTModalHostViewImproved.m
+++ b/ios/Views/RCTModalHostViewImproved.m
@@ -42,12 +42,42 @@ - (instancetype)initWithBridge:(RCTBridge *)bridge
   return self;
 }
 
+- (void)insertReactSubview:(UIView *)subview atIndex:(NSInteger)atIndex
+{
+  [super insertReactSubview:subview atIndex:atIndex];
+  [_modalViewController.view insertSubview:subview atIndex:0];
+}
+
+- (void)removeReactSubview:(UIView *)subview
+{
+  RCTAssert(subview == _reactSubview, @"Cannot remove view other than modal view");
+  // Superclass (category) removes the `subview` from actual `superview`.
+  [super removeReactSubview:subview];
+  [_touchHandler detachFromView:subview];
+  _reactSubview = nil;
+}
+
+- (void)didUpdateReactSubviews
+{
+  // Do nothing, as subview (singular) is managed by `insertReactSubview:atIndex:`
+}
+
 - (void)ensurePresentedOnlyIfNeeded
 {
   BOOL shouldBePresented = !_isPresented && super.visible && self.window;
   if (shouldBePresented) {
     RCTAssert(self.reactViewController, @"Can't present modal view controller without a presenting view controller");
+    _modalViewController.supportedInterfaceOrientations = [self supportedOrientationsMask];
 
+    if ([self.animationType isEqualToString:@"fade"]) {
+      _modalViewController.modalTransitionStyle = UIModalTransitionStyleCrossDissolve;
+    } else if ([self.animationType isEqualToString:@"slide"]) {
+      _modalViewController.modalTransitionStyle = UIModalTransitionStyleCoverVertical;
+    }
+    if (self.presentationStyle != UIModalPresentationNone) {
+      _modalViewController.modalPresentationStyle = self.presentationStyle;
+    }
+    _modalViewController.presentationController.delegate = self;
     [self.delegate presentModalHostView:self withViewController:_modalViewController animated:[self hasAnimationType]];
     _isPresented = YES;
   }
@@ -58,6 +88,33 @@ - (void)ensurePresentedOnlyIfNeeded
   }
 }
 
+- (UIInterfaceOrientationMask)supportedOrientationsMask
+{
+  if (self.supportedOrientations.count == 0) {
+    if ([[UIDevice currentDevice] userInterfaceIdiom] == UIUserInterfaceIdiomPad) {
+      return UIInterfaceOrientationMaskAll;
+    } else {
+      return UIInterfaceOrientationMaskPortrait;
+    }
+  }
+
+  UIInterfaceOrientationMask supportedOrientations = 0;
+  for (NSString *orientation in self.supportedOrientations) {
+    if ([orientation isEqualToString:@"portrait"]) {
+      supportedOrientations |= UIInterfaceOrientationMaskPortrait;
+    } else if ([orientation isEqualToString:@"portrait-upside-down"]) {
+      supportedOrientations |= UIInterfaceOrientationMaskPortraitUpsideDown;
+    } else if ([orientation isEqualToString:@"landscape"]) {
+      supportedOrientations |= UIInterfaceOrientationMaskLandscape;
+    } else if ([orientation isEqualToString:@"landscape-left"]) {
+      supportedOrientations |= UIInterfaceOrientationMaskLandscapeLeft;
+    } else if ([orientation isEqualToString:@"landscape-right"]) {
+      supportedOrientations |= UIInterfaceOrientationMaskLandscapeRight;
+    }
+  }
+  return supportedOrientations;
+}
+
 - (void)dismissModalViewController
 {
   if (_isPresented) {
diff --git a/ios/Views/RCTModalHostViewImprovedManager.m b/ios/Views/RCTModalHostViewImprovedManager.m
index e5d08b6..26a9eb1 100644
--- a/ios/Views/RCTModalHostViewImprovedManager.m
+++ b/ios/Views/RCTModalHostViewImprovedManager.m
@@ -10,8 +10,21 @@
 #import "RCTModalHostViewImproved.h"
 #import "RCTShadowView.h"
 #import "RCTModalManager.h"
+#import "RCTModalHostViewManager.h"
 
-@interface RCTModalHostShadowView : RCTShadowView
+@interface RCTModalHostShadowViewImproved : RCTShadowView
+
+@end
+
+@implementation RCTModalHostShadowViewImproved
+
+- (void)insertReactSubview:(id<RCTComponent>)subview atIndex:(NSInteger)atIndex
+{
+  [super insertReactSubview:subview atIndex:atIndex];
+  if ([subview isKindOfClass:[RCTShadowView class]]) {
+    ((RCTShadowView *)subview).size = RCTScreenSize();
+  }
+}
 
 @end
 
@@ -37,6 +50,7 @@ - (UIView *)view
   return view;
 }
 
+/*
 - (void)presentModalHostView:(RCTModalHostViewImproved *)modalHostView
           withViewController:(RCTModalHostViewControllerImproved *)viewController
                     animated:(BOOL)animated
@@ -46,9 +60,16 @@ - (void)presentModalHostView:(RCTModalHostViewImproved *)modalHostView
       modalHostView.onShow(nil);
     }
   };
-  [[modalHostView reactViewController] presentViewController:viewController
+
+  dispatch_async(dispatch_get_main_queue(), ^{
+    if (self.presentationBlock) {
+      self.presentationBlock([modalHostView reactViewController], viewController, animated, completionBlock);
+    } else {
+      [[modalHostView reactViewController] presentViewController:viewController
                                                         animated:animated
                                                       completion:completionBlock];
+    }
+  });
 }
 
 - (void)dismissModalHostView:(RCTModalHostViewImproved *)modalHostView
@@ -64,14 +85,19 @@ - (void)dismissModalHostView:(RCTModalHostViewImproved *)modalHostView
                                                     animated:animated
                                                   completion:completionBlock];
 }
-
-/**
-Over-ride this method to add change the React Native Shadow View for this class.
+*/
 
 - (RCTShadowView *)shadowView
 {
- return [RCTModalHostShadowViewImproved new];
+  return [RCTModalHostShadowViewImproved new];
+}
+
+- (void)invalidate
+{
+  for (RCTModalHostView *hostView in _hostViews) {
+    [hostView invalidate];
+  }
+  _hostViews = nil;
 }
-**/
 
 @end

From 9d6d42ad15c9200e9c648e7be594469e322df30d Mon Sep 17 00:00:00 2001
From: Fabrizio Bertoglio <fabrizio.bertoglio@gmail.com>
Date: Sun, 28 Jan 2024 15:57:16 +0800
Subject: [PATCH 11/13] working touch handler and dismiss

---
 ios/Views/RCTModalHostViewImprovedManager.m | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/ios/Views/RCTModalHostViewImprovedManager.m b/ios/Views/RCTModalHostViewImprovedManager.m
index 26a9eb1..40fad5e 100644
--- a/ios/Views/RCTModalHostViewImprovedManager.m
+++ b/ios/Views/RCTModalHostViewImprovedManager.m
@@ -50,7 +50,6 @@ - (UIView *)view
   return view;
 }
 
-/*
 - (void)presentModalHostView:(RCTModalHostViewImproved *)modalHostView
           withViewController:(RCTModalHostViewControllerImproved *)viewController
                     animated:(BOOL)animated
@@ -81,11 +80,8 @@ - (void)dismissModalHostView:(RCTModalHostViewImproved *)modalHostView
       [[self.bridge moduleForClass:[RCTModalManager class]] modalDismissed:modalHostView.identifier];
     }
   };
-  [[modalHostView reactViewController] presentViewController:viewController
-                                                    animated:animated
-                                                  completion:completionBlock];
+  [viewController.presentingViewController dismissViewControllerAnimated:animated completion:completionBlock];
 }
-*/
 
 - (RCTShadowView *)shadowView
 {

From 30c100c75eabfd35b3d6610e5c5fbcaa2784ae96 Mon Sep 17 00:00:00 2001
From: Fabrizio Bertoglio <fabrizio.bertoglio@gmail.com>
Date: Sun, 28 Jan 2024 16:11:36 +0800
Subject: [PATCH 12/13] remove not required logic

---
 ios/Views/RCTModalHostViewImproved.m        | 15 +----------
 ios/Views/RCTModalHostViewImprovedManager.m | 28 ++++++---------------
 2 files changed, 8 insertions(+), 35 deletions(-)

diff --git a/ios/Views/RCTModalHostViewImproved.m b/ios/Views/RCTModalHostViewImproved.m
index 2fdfe39..03d5deb 100644
--- a/ios/Views/RCTModalHostViewImproved.m
+++ b/ios/Views/RCTModalHostViewImproved.m
@@ -48,20 +48,6 @@ - (void)insertReactSubview:(UIView *)subview atIndex:(NSInteger)atIndex
   [_modalViewController.view insertSubview:subview atIndex:0];
 }
 
-- (void)removeReactSubview:(UIView *)subview
-{
-  RCTAssert(subview == _reactSubview, @"Cannot remove view other than modal view");
-  // Superclass (category) removes the `subview` from actual `superview`.
-  [super removeReactSubview:subview];
-  [_touchHandler detachFromView:subview];
-  _reactSubview = nil;
-}
-
-- (void)didUpdateReactSubviews
-{
-  // Do nothing, as subview (singular) is managed by `insertReactSubview:atIndex:`
-}
-
 - (void)ensurePresentedOnlyIfNeeded
 {
   BOOL shouldBePresented = !_isPresented && super.visible && self.window;
@@ -127,4 +113,5 @@ - (BOOL)hasAnimationType
 {
   return ![self.animationType isEqualToString:@"none"];
 }
+
 @end
diff --git a/ios/Views/RCTModalHostViewImprovedManager.m b/ios/Views/RCTModalHostViewImprovedManager.m
index 40fad5e..a3d4af8 100644
--- a/ios/Views/RCTModalHostViewImprovedManager.m
+++ b/ios/Views/RCTModalHostViewImprovedManager.m
@@ -12,22 +12,6 @@
 #import "RCTModalManager.h"
 #import "RCTModalHostViewManager.h"
 
-@interface RCTModalHostShadowViewImproved : RCTShadowView
-
-@end
-
-@implementation RCTModalHostShadowViewImproved
-
-- (void)insertReactSubview:(id<RCTComponent>)subview atIndex:(NSInteger)atIndex
-{
-  [super insertReactSubview:subview atIndex:atIndex];
-  if ([subview isKindOfClass:[RCTShadowView class]]) {
-    ((RCTShadowView *)subview).size = RCTScreenSize();
-  }
-}
-
-@end
-
 @interface RCTModalHostViewImprovedManager () <RCTModalHostViewInteractorImproved>
 
 @end
@@ -80,12 +64,14 @@ - (void)dismissModalHostView:(RCTModalHostViewImproved *)modalHostView
       [[self.bridge moduleForClass:[RCTModalManager class]] modalDismissed:modalHostView.identifier];
     }
   };
-  [viewController.presentingViewController dismissViewControllerAnimated:animated completion:completionBlock];
-}
 
-- (RCTShadowView *)shadowView
-{
-  return [RCTModalHostShadowViewImproved new];
+  dispatch_async(dispatch_get_main_queue(), ^{
+    if (self.dismissalBlock) {
+      self.dismissalBlock([modalHostView reactViewController], viewController, animated, completionBlock);
+    } else {
+      [viewController.presentingViewController dismissViewControllerAnimated:animated completion:completionBlock];
+    }
+  });
 }
 
 - (void)invalidate

From 653378898f235577e7a9081eeb25422cb2ea880b Mon Sep 17 00:00:00 2001
From: Fabrizio Bertoglio <fabrizio.bertoglio@gmail.com>
Date: Tue, 30 Jan 2024 08:00:25 +0800
Subject: [PATCH 13/13] re-implement basic modal example

---
 .../src/examples/Modal/ModalPresentation.js   | 259 +++++++++++++++---
 1 file changed, 223 insertions(+), 36 deletions(-)

diff --git a/example/src/examples/Modal/ModalPresentation.js b/example/src/examples/Modal/ModalPresentation.js
index b145746..358da02 100644
--- a/example/src/examples/Modal/ModalPresentation.js
+++ b/example/src/examples/Modal/ModalPresentation.js
@@ -11,18 +11,9 @@
 /* eslint-disable no-alert */
 
 import * as React from 'react';
-import {
-  TouchableOpacity,
-  Button,
-  Modal,
-  Platform,
-  StyleSheet,
-  Switch,
-  Text,
-  View,
-} from 'react-native';
-import type { RNTesterModuleExample } from '../../types/RNTesterTypes';
-import type { Props as ModalProps } from 'react-native/Libraries/Modal/Modal';
+import {Modal, Platform, StyleSheet, Switch, Text, View} from 'react-native';
+import type {RNTesterModuleExample} from '../../types/RNTesterTypes';
+import type {Props as ModalProps} from 'react-native/Libraries/Modal/Modal';
 import RNTOption from '../../components/RNTOption';
 const RNTesterButton = require('../../components/RNTesterButton');
 
@@ -42,33 +33,229 @@ const supportedOrientations = [
 ];
 
 function ModalPresentation() {
-  const [firstModalVisible, setFirstModalVisible] = React.useState(true);
-  const [secondModalVisible, setSecondModalVisible] = React.useState(true);
+  const onDismiss = React.useCallback(() => {
+    alert('onDismiss');
+  }, []);
+
+  const onShow = React.useCallback(() => {
+    alert('onShow');
+  }, []);
+
+  const onRequestClose = React.useCallback(() => {
+    console.log('onRequestClose');
+  }, []);
+
+  const [props, setProps] = React.useState<ModalProps>({
+    animationType: 'none',
+    transparent: false,
+    hardwareAccelerated: false,
+    statusBarTranslucent: false,
+    presentationStyle: Platform.select({
+      ios: 'fullScreen',
+      default: undefined,
+    }),
+    supportedOrientations: Platform.select({
+      ios: ['portrait'],
+      default: undefined,
+    }),
+    onDismiss: undefined,
+    onShow: undefined,
+    visible: false,
+  });
+  const presentationStyle = props.presentationStyle;
+  const hardwareAccelerated = props.hardwareAccelerated;
+  const statusBarTranslucent = props.statusBarTranslucent;
+
+  const [currentOrientation, setCurrentOrientation] = React.useState('unknown');
+
+  /* $FlowFixMe[missing-local-annot] The type annotation(s) required by Flow's
+   * LTI update could not be added via codemod */
+  const onOrientationChange = event =>
+    setCurrentOrientation(event.nativeEvent.orientation);
+
+  const controls = (
+    <>
+      <View style={styles.inlineBlock}>
+        <Text style={styles.title}>Status Bar Translucent 🟢</Text>
+        <Switch
+          value={statusBarTranslucent}
+          onValueChange={enabled =>
+            setProps(prev => ({...prev, statusBarTranslucent: enabled}))
+          }
+        />
+      </View>
+      <View style={styles.inlineBlock}>
+        <Text style={styles.title}>Hardware Acceleration 🟢</Text>
+        <Switch
+          value={hardwareAccelerated}
+          onValueChange={enabled =>
+            setProps(prev => ({
+              ...prev,
+              hardwareAccelerated: enabled,
+            }))
+          }
+        />
+      </View>
+      <View style={styles.block}>
+        <Text style={styles.title}>Presentation Style ⚫️</Text>
+        <View style={styles.row}>
+          {presentationStyles.map(type => (
+            <RNTOption
+              key={type}
+              disabled={Platform.OS !== 'ios'}
+              style={styles.option}
+              label={type}
+              multiSelect={true}
+              onPress={() =>
+                setProps(prev => {
+                  if (type === 'overFullScreen' && prev.transparent === true) {
+                    return {
+                      ...prev,
+                      presentationStyle: type,
+                      transparent: false,
+                    };
+                  }
+                  return {
+                    ...prev,
+                    presentationStyle:
+                      type === prev.presentationStyle ? undefined : type,
+                  };
+                })
+              }
+              selected={type === presentationStyle}
+            />
+          ))}
+        </View>
+      </View>
+      <View style={styles.block}>
+        <View style={styles.rowWithSpaceBetween}>
+          <Text style={styles.title}>Transparent</Text>
+          <Switch
+            value={props.transparent}
+            onValueChange={enabled =>
+              setProps(prev => ({...prev, transparent: enabled}))
+            }
+          />
+        </View>
+        {Platform.OS === 'ios' && presentationStyle !== 'overFullScreen' ? (
+          <Text style={styles.warning}>
+            iOS Modal can only be transparent with 'overFullScreen' Presentation
+            Style
+          </Text>
+        ) : null}
+      </View>
+      <View style={styles.block}>
+        <Text style={styles.title}>Supported Orientation ⚫️</Text>
+        <View style={styles.row}>
+          {supportedOrientations.map(orientation => (
+            <RNTOption
+              key={orientation}
+              disabled={Platform.OS !== 'ios'}
+              style={styles.option}
+              label={orientation}
+              multiSelect={true}
+              onPress={() =>
+                setProps(prev => {
+                  if (prev.supportedOrientations?.includes(orientation)) {
+                    return {
+                      ...prev,
+                      supportedOrientations: prev.supportedOrientations?.filter(
+                        o => o !== orientation,
+                      ),
+                    };
+                  }
+                  return {
+                    ...prev,
+                    supportedOrientations: [
+                      ...(prev.supportedOrientations ?? []),
+                      orientation,
+                    ],
+                  };
+                })
+              }
+              selected={props.supportedOrientations?.includes(orientation)}
+            />
+          ))}
+        </View>
+      </View>
+      <View style={styles.block}>
+        <Text style={styles.title}>Actions</Text>
+        <View style={styles.row}>
+          <RNTOption
+            key="onShow"
+            style={styles.option}
+            label="onShow"
+            multiSelect={true}
+            onPress={() =>
+              setProps(prev => ({
+                ...prev,
+                onShow: prev.onShow ? undefined : onShow,
+              }))
+            }
+            selected={!!props.onShow}
+          />
+          <RNTOption
+            key="onDismiss"
+            style={styles.option}
+            label="onDismiss ⚫️"
+            disabled={Platform.OS !== 'ios'}
+            onPress={() =>
+              setProps(prev => ({
+                ...prev,
+                onDismiss: prev.onDismiss ? undefined : onDismiss,
+              }))
+            }
+            selected={!!props.onDismiss}
+          />
+        </View>
+      </View>
+    </>
+  );
+
   return (
     <View>
-      <Modal visible={firstModalVisible} presentationStyle="pageSheet">
-        <Text>This is first modal</Text>
-        <Button
-          title="dismiss first modal"
-          onPress={() => {
-            console.log('press button');
-            setFirstModalVisible(false);
-          }}
-        />
-        <TouchableOpacity
-          onPress={() => console.log('touchable')}
-          style={{
-            backgroundColor: 'yellow',
-            height: 100,
-            width: 400,
-            borderWidth: 1,
-          }}
-        >
-    <Text>
-    Press ME
-    </Text>
-        </TouchableOpacity>
+      <RNTesterButton
+        onPress={() => setProps(prev => ({...prev, visible: true}))}>
+        Show Modal
+      </RNTesterButton>
+      <Modal
+        {...props}
+        onRequestClose={onRequestClose}
+        onOrientationChange={onOrientationChange}>
+        <View style={styles.modalContainer}>
+          <View style={styles.modalInnerContainer}>
+            <Text testID="modal_animationType_text">
+              This modal was presented with animationType: '
+              {props.animationType}'
+            </Text>
+            {Platform.OS === 'ios' ? (
+              <Text>
+                It is currently displayed in {currentOrientation} mode.
+              </Text>
+            ) : null}
+            <RNTesterButton
+              onPress={() => setProps(prev => ({...prev, visible: false}))}>
+              Close
+            </RNTesterButton>
+            {controls}
+          </View>
+        </View>
       </Modal>
+      <View style={styles.block}>
+        <Text style={styles.title}>Animation Type</Text>
+        <View style={styles.row}>
+          {animationTypes.map(type => (
+            <RNTOption
+              key={type}
+              style={styles.option}
+              label={type}
+              onPress={() => setProps(prev => ({...prev, animationType: type}))}
+              selected={type === props.animationType}
+            />
+          ))}
+        </View>
+      </View>
+      {controls}
     </View>
   );
 }