From e8af73e4d9c51abe7ade61406cac8ade301d242c Mon Sep 17 00:00:00 2001
From: kacperkapusciak <kacper.kapusciak@swmansion.com>
Date: Mon, 4 Jul 2022 11:36:28 +0200
Subject: [PATCH 1/7] fix: don't change screen on which you handleSwipe

when we were swiping with the current logic in the next frame properties were taken from previous screen
---
 ios/RNSScreenStack.mm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ios/RNSScreenStack.mm b/ios/RNSScreenStack.mm
index 67d8e893cf..1eb76cc78f 100644
--- a/ios/RNSScreenStack.mm
+++ b/ios/RNSScreenStack.mm
@@ -675,7 +675,7 @@ - (void)setupGestureHandlers
 
 - (void)handleSwipe:(UIPanGestureRecognizer *)gestureRecognizer
 {
-  RNSScreenView *topScreen = ((RNSScreen *)_controller.viewControllers.lastObject).screenView;
+  RNSScreenView *topScreen = _reactSubviews.lastObject;
   float translation;
   float velocity;
   float distance;

From 893ca9750078afbb42c69ada7661456325c919ee Mon Sep 17 00:00:00 2001
From: kacperkapusciak <kacper.kapusciak@swmansion.com>
Date: Mon, 4 Jul 2022 11:43:29 +0200
Subject: [PATCH 2/7] chore: add example

Co-authored-by: Wojciech Lewicki <wojciech.lewicki@swmansion.com>
---
 TestsExample/App.js       |  3 +-
 TestsExample/src/Test.tsx | 68 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 70 insertions(+), 1 deletion(-)
 create mode 100644 TestsExample/src/Test.tsx

diff --git a/TestsExample/App.js b/TestsExample/App.js
index cdd5348eb0..f60abd055c 100644
--- a/TestsExample/App.js
+++ b/TestsExample/App.js
@@ -78,13 +78,14 @@ import Test1260 from './src/Test1260';
 import Test1296 from './src/Test1296';
 import Test1299 from './src/Test1299';
 import Test1419 from './src/Test1419';
+import Test from './src/Test';
 
 enableFreeze(true);
 
 export default function App() {
   return (
     <ReanimatedScreenProvider>
-      <Test42 />
+      <Test />
     </ReanimatedScreenProvider>
   );
 }
diff --git a/TestsExample/src/Test.tsx b/TestsExample/src/Test.tsx
new file mode 100644
index 0000000000..f4a8937a6f
--- /dev/null
+++ b/TestsExample/src/Test.tsx
@@ -0,0 +1,68 @@
+import {NavigationContainer, ParamListBase} from '@react-navigation/native';
+import * as React from 'react';
+import {Button, Text, View} from 'react-native';
+import {
+  createNativeStackNavigator,
+  NativeStackNavigationProp,
+} from 'react-native-screens/native-stack';
+
+function First({
+  navigation,
+}: {
+  navigation: NativeStackNavigationProp<ParamListBase>;
+}) {
+  return (
+    <View style={{flex: 1, alignItems: 'center', justifyContent: 'center'}}>
+      <Text>First Screen</Text>
+      <Button
+        title="Go to second"
+        onPress={() => navigation.navigate('Second')}
+      />
+    </View>
+  );
+}
+
+function Second() {
+  return (
+    <View
+      style={{
+        flex: 1,
+        alignItems: 'center',
+        justifyContent: 'center',
+        backgroundColor: 'tomato',
+      }}>
+      <Text>Second Screen</Text>
+      <Text>Swipe vertically</Text>
+    </View>
+  );
+}
+
+const Stack = createNativeStackNavigator();
+
+function App() {
+  return (
+    <NavigationContainer>
+      <Stack.Navigator>
+        <Stack.Screen
+          name="First"
+          component={First}
+          options={
+            {
+              // currently it only works when you also set this prop on the previos screen
+              // swipeDirection: 'vertical',
+            }
+          }
+        />
+        <Stack.Screen
+          name="Second"
+          component={Second}
+          options={{
+            swipeDirection: 'vertical',
+          }}
+        />
+      </Stack.Navigator>
+    </NavigationContainer>
+  );
+}
+
+export default App;

From 817490f9c91044d842d52f3a6bb5d90138f5b4c9 Mon Sep 17 00:00:00 2001
From: kacperkapusciak <kacper.kapusciak@swmansion.com>
Date: Mon, 4 Jul 2022 11:46:20 +0200
Subject: [PATCH 3/7] chore: rename test example

Co-authored-by: Wojciech Lewicki <wojciech.lewicki@swmansion.com>
---
 TestsExample/App.js                         | 4 ++--
 TestsExample/src/{Test.tsx => Test1509.tsx} | 0
 2 files changed, 2 insertions(+), 2 deletions(-)
 rename TestsExample/src/{Test.tsx => Test1509.tsx} (100%)

diff --git a/TestsExample/App.js b/TestsExample/App.js
index f60abd055c..5c1b13bb88 100644
--- a/TestsExample/App.js
+++ b/TestsExample/App.js
@@ -78,14 +78,14 @@ import Test1260 from './src/Test1260';
 import Test1296 from './src/Test1296';
 import Test1299 from './src/Test1299';
 import Test1419 from './src/Test1419';
-import Test from './src/Test';
+import Test1509 from './src/Test1509';
 
 enableFreeze(true);
 
 export default function App() {
   return (
     <ReanimatedScreenProvider>
-      <Test />
+      <Test42 />
     </ReanimatedScreenProvider>
   );
 }
diff --git a/TestsExample/src/Test.tsx b/TestsExample/src/Test1509.tsx
similarity index 100%
rename from TestsExample/src/Test.tsx
rename to TestsExample/src/Test1509.tsx

From 30feb5df54b87770d06d957f5d263a24f04d9d4e Mon Sep 17 00:00:00 2001
From: Kacper Kafara <kacperkafara@gmail.com>
Date: Thu, 7 Jul 2022 16:01:16 +0200
Subject: [PATCH 4/7] chore: add test for #1476

Submitted in #1514 by @hurali97

Co-authored-by: Muhammad Hur Ali <hurali87@gmail.com>
---
 TestsExample/src/Test1509v2/ModalGroup.tsx    |  9 +++++++++
 TestsExample/src/Test1509v2/ScreenGroup.tsx   | 11 +++++++++++
 TestsExample/src/Test1509v2/StackBuilder.tsx  | 16 ++++++++++++++++
 TestsExample/src/Test1509v2/index.tsx         | 19 +++++++++++++++++++
 TestsExample/src/Test1509v2/modals/ModalA.tsx | 17 +++++++++++++++++
 TestsExample/src/Test1509v2/modals/index.tsx  |  9 +++++++++
 .../src/Test1509v2/screens/ScreenA.tsx        | 11 +++++++++++
 .../src/Test1509v2/screens/ScreenB.tsx        | 12 ++++++++++++
 TestsExample/src/Test1509v2/screens/index.tsx | 12 ++++++++++++
 9 files changed, 116 insertions(+)
 create mode 100644 TestsExample/src/Test1509v2/ModalGroup.tsx
 create mode 100644 TestsExample/src/Test1509v2/ScreenGroup.tsx
 create mode 100644 TestsExample/src/Test1509v2/StackBuilder.tsx
 create mode 100644 TestsExample/src/Test1509v2/index.tsx
 create mode 100644 TestsExample/src/Test1509v2/modals/ModalA.tsx
 create mode 100644 TestsExample/src/Test1509v2/modals/index.tsx
 create mode 100644 TestsExample/src/Test1509v2/screens/ScreenA.tsx
 create mode 100644 TestsExample/src/Test1509v2/screens/ScreenB.tsx
 create mode 100644 TestsExample/src/Test1509v2/screens/index.tsx

diff --git a/TestsExample/src/Test1509v2/ModalGroup.tsx b/TestsExample/src/Test1509v2/ModalGroup.tsx
new file mode 100644
index 0000000000..d7cb0bc5f5
--- /dev/null
+++ b/TestsExample/src/Test1509v2/ModalGroup.tsx
@@ -0,0 +1,9 @@
+import StackBuilder from './StackBuilder';
+import Modals from './modals';
+
+
+export default StackBuilder(Modals, {
+  headerShown: false,
+  animation: 'fade_from_bottom',
+  presentation: 'containedTransparentModal',
+});
\ No newline at end of file
diff --git a/TestsExample/src/Test1509v2/ScreenGroup.tsx b/TestsExample/src/Test1509v2/ScreenGroup.tsx
new file mode 100644
index 0000000000..795c2f3f38
--- /dev/null
+++ b/TestsExample/src/Test1509v2/ScreenGroup.tsx
@@ -0,0 +1,11 @@
+import StackBuilder from './StackBuilder';
+import Screens from './screens';
+
+
+export default StackBuilder(Screens, {
+  headerShadowVisible: false,
+  headerTintColor: 'black',
+  headerBackTitleVisible: false,
+  fullScreenGestureEnabled: true,
+  contentStyle: { backgroundColor: 'white' },
+});
\ No newline at end of file
diff --git a/TestsExample/src/Test1509v2/StackBuilder.tsx b/TestsExample/src/Test1509v2/StackBuilder.tsx
new file mode 100644
index 0000000000..bf79a6472f
--- /dev/null
+++ b/TestsExample/src/Test1509v2/StackBuilder.tsx
@@ -0,0 +1,16 @@
+import React from 'react';
+import { createNativeStackNavigator, NativeStackNavigationOptions } from '@react-navigation/native-stack';
+
+export const NativeStack = createNativeStackNavigator();
+
+export default (configs: any, groupOptions?: NativeStackNavigationOptions) => {
+  return () => (
+    <NativeStack.Group screenOptions={groupOptions}>
+      {configs.map(config => {
+        const { options, ...anyConfig } = config;
+        const { statusBarStyle, statusBarAnimation, statusBarHidden, ...anyOption } = options || {};
+        return <NativeStack.Screen key={config.name} {...anyConfig} options={anyOption} />;
+      })}
+    </NativeStack.Group>
+  );
+};
\ No newline at end of file
diff --git a/TestsExample/src/Test1509v2/index.tsx b/TestsExample/src/Test1509v2/index.tsx
new file mode 100644
index 0000000000..8f66f334bf
--- /dev/null
+++ b/TestsExample/src/Test1509v2/index.tsx
@@ -0,0 +1,19 @@
+import React from 'react';
+import {
+  NavigationContainer as NavigationContainerNative,
+} from '@react-navigation/native';
+
+import ModalGroup from './ModalGroup';
+import ScreenGroup from './ScreenGroup';
+import { NativeStack } from './StackBuilder';
+
+export default function TestModalPresentation() {
+  return (
+    <NavigationContainerNative>
+      <NativeStack.Navigator>
+        {ScreenGroup()}
+        {ModalGroup()}
+      </NativeStack.Navigator>
+    </NavigationContainerNative>
+  );
+}
\ No newline at end of file
diff --git a/TestsExample/src/Test1509v2/modals/ModalA.tsx b/TestsExample/src/Test1509v2/modals/ModalA.tsx
new file mode 100644
index 0000000000..64eb6bef4c
--- /dev/null
+++ b/TestsExample/src/Test1509v2/modals/ModalA.tsx
@@ -0,0 +1,17 @@
+import React from 'react';
+import { Button, Text, View } from 'react-native';
+
+type Props = {};
+
+export default function ModalA(props: Props) {
+  return (
+    <View style={{ flex: 1, backgroundColor: 'rgba(255,0,0,0.6)',alignItems: 'center', justifyContent: 'center'}}>
+      <View style={{backgroundColor: 'white'}}>
+
+      <Text>ModalA, with opacity and backgroundColor</Text>
+      <Text>At ModalA, we still can gesture swipe the screenB back to screenA, </Text>
+      <Button title={"pop modal"} onPress={() => props.navigation.pop()} />
+      </View>
+    </View>
+  );
+}
\ No newline at end of file
diff --git a/TestsExample/src/Test1509v2/modals/index.tsx b/TestsExample/src/Test1509v2/modals/index.tsx
new file mode 100644
index 0000000000..9a7df758df
--- /dev/null
+++ b/TestsExample/src/Test1509v2/modals/index.tsx
@@ -0,0 +1,9 @@
+import ModalA from './ModalA';
+
+export default [
+  {
+    name: 'modalA',
+    component: ModalA,
+    options: { animation: 'fade' },
+  }
+]
diff --git a/TestsExample/src/Test1509v2/screens/ScreenA.tsx b/TestsExample/src/Test1509v2/screens/ScreenA.tsx
new file mode 100644
index 0000000000..bed3c6a44e
--- /dev/null
+++ b/TestsExample/src/Test1509v2/screens/ScreenA.tsx
@@ -0,0 +1,11 @@
+import React from 'react';
+import { Button, Text, View } from 'react-native';
+
+export default function ScreenA({navigation}) {
+  return (
+    <View style={{flex:1, backgroundColor: 'blue', alignItems: 'center', justifyContent: 'center'}} >
+      <Text style={{color: 'white'}}>ScreenA, with backgroundColor: 'blue'</Text>
+      <Button title={"navigate to: Screen B"} onPress={() => navigation.navigate('screenB')} />
+    </View>
+  );
+}
\ No newline at end of file
diff --git a/TestsExample/src/Test1509v2/screens/ScreenB.tsx b/TestsExample/src/Test1509v2/screens/ScreenB.tsx
new file mode 100644
index 0000000000..9fb47551f2
--- /dev/null
+++ b/TestsExample/src/Test1509v2/screens/ScreenB.tsx
@@ -0,0 +1,12 @@
+import React from 'react';
+import { Button, Text, View } from 'react-native';
+
+
+export default function ScreenB({navigation}) {
+  return (
+    <View style={{flex:1, backgroundColor: 'cyan', alignItems: 'center', justifyContent: 'center'}} >
+      <Text>ScreenB, with backgroundColor: 'cyan'</Text>
+      <Button title={"navigate to: Modal A"} onPress={() => navigation.navigate('modalA')} />
+    </View>
+  );
+}
\ No newline at end of file
diff --git a/TestsExample/src/Test1509v2/screens/index.tsx b/TestsExample/src/Test1509v2/screens/index.tsx
new file mode 100644
index 0000000000..5de5d649dc
--- /dev/null
+++ b/TestsExample/src/Test1509v2/screens/index.tsx
@@ -0,0 +1,12 @@
+import ScreenA from './ScreenA';
+import ScreenB from './ScreenB';
+export default [
+  {
+    name: 'screenA',
+    component: ScreenA,
+  },
+  {
+    name: 'screenB',
+    component: ScreenB,
+  }
+]
\ No newline at end of file

From d7d04e6338658c18d91f80475f6174c028633f61 Mon Sep 17 00:00:00 2001
From: Kacper Kafara <kacperkafara@gmail.com>
Date: Thu, 7 Jul 2022 16:05:39 +0200
Subject: [PATCH 5/7] chore: add dependency on @react-navigation/native-stack

Required by Test1509v2
---
 TestsExample/App.js       |  3 ++-
 TestsExample/package.json |  1 +
 TestsExample/yarn.lock    | 13 +++++++++++++
 3 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/TestsExample/App.js b/TestsExample/App.js
index 5c1b13bb88..ade87ba74c 100644
--- a/TestsExample/App.js
+++ b/TestsExample/App.js
@@ -79,13 +79,14 @@ import Test1296 from './src/Test1296';
 import Test1299 from './src/Test1299';
 import Test1419 from './src/Test1419';
 import Test1509 from './src/Test1509';
+import Test1509v2 from './src/Test1509v2';
 
 enableFreeze(true);
 
 export default function App() {
   return (
     <ReanimatedScreenProvider>
-      <Test42 />
+      <Test1509v2 />
     </ReanimatedScreenProvider>
   );
 }
diff --git a/TestsExample/package.json b/TestsExample/package.json
index a40059bc84..76c6b73bcd 100644
--- a/TestsExample/package.json
+++ b/TestsExample/package.json
@@ -22,6 +22,7 @@
     "react-native-gesture-handler": "^2.5.0",
     "react-native-reanimated": "3.0.0-rc.0",
     "react-native-safe-area-context": "^4.0.1-rc.5",
+    "@react-navigation/native-stack": "^6.7.0",
     "react-native-screens": "link:../"
   },
   "devDependencies": {
diff --git a/TestsExample/yarn.lock b/TestsExample/yarn.lock
index 23c35ef9d2..912e76e113 100644
--- a/TestsExample/yarn.lock
+++ b/TestsExample/yarn.lock
@@ -1368,6 +1368,19 @@
   resolved "https://registry.yarnpkg.com/@react-navigation/elements/-/elements-1.3.3.tgz#9f56b650a9a1a8263a271628be7342c8121d1788"
   integrity sha512-Lv2lR7si5gNME8dRsqz57d54m4FJtrwHRjNQLOyQO546ZxO+g864cSvoLC6hQedQU0+IJnPTsZiEI2hHqfpEpw==
 
+"@react-navigation/elements@^1.3.4":
+  version "1.3.4"
+  resolved "https://registry.yarnpkg.com/@react-navigation/elements/-/elements-1.3.4.tgz#abb48136508c1e60862dc14a101ce02ff685a337"
+  integrity sha512-O0jICpjn3jskVo4yiWzZozmj7DZy1ZBbn3O7dbenuUjZSj/cscjwaapmZZFGcI/IMmjmx8UTKsybhCFEIbGf3g==
+
+"@react-navigation/native-stack@^6.7.0":
+  version "6.7.0"
+  resolved "https://registry.yarnpkg.com/@react-navigation/native-stack/-/native-stack-6.7.0.tgz#57e6390e3e4e46b3a7f580810c3d384b4676b7e5"
+  integrity sha512-03CuSwbBvP9+iXgjrTRRw+aog+KZXbhPzqCWVExzIWNOzf5/PJEcdtlm9KDrx2aHHDtDA6LRLKQA4UIlJOmNzA==
+  dependencies:
+    "@react-navigation/elements" "^1.3.4"
+    warn-once "^0.1.0"
+
 "@react-navigation/native@^6.0.10":
   version "6.0.10"
   resolved "https://registry.yarnpkg.com/@react-navigation/native/-/native-6.0.10.tgz#c58aa176eb0e63f3641c83a65c509faf253e4385"

From 552cd72e934e4b0ae9e9a98c1a9aeb2f39292309 Mon Sep 17 00:00:00 2001
From: Kacper Kafara <kacperkafara@gmail.com>
Date: Thu, 7 Jul 2022 22:21:38 +0200
Subject: [PATCH 6/7] fix: typo in comment

---
 TestsExample/src/Test1509.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/TestsExample/src/Test1509.tsx b/TestsExample/src/Test1509.tsx
index f4a8937a6f..4bef12ae72 100644
--- a/TestsExample/src/Test1509.tsx
+++ b/TestsExample/src/Test1509.tsx
@@ -48,7 +48,7 @@ function App() {
           component={First}
           options={
             {
-              // currently it only works when you also set this prop on the previos screen
+              // currently it only works when you also set this prop on the previous screen
               // swipeDirection: 'vertical',
             }
           }

From 29d385d413074be62256f1223457e71770de0382 Mon Sep 17 00:00:00 2001
From: Kacper Kafara <kacperkafara@gmail.com>
Date: Fri, 8 Jul 2022 09:09:20 +0200
Subject: [PATCH 7/7] chore: remove test 1509v2

---
 TestsExample/App.js                           |  3 +--
 TestsExample/src/Test1509v2/ModalGroup.tsx    |  9 ---------
 TestsExample/src/Test1509v2/ScreenGroup.tsx   | 11 -----------
 TestsExample/src/Test1509v2/StackBuilder.tsx  | 16 ----------------
 TestsExample/src/Test1509v2/index.tsx         | 19 -------------------
 TestsExample/src/Test1509v2/modals/ModalA.tsx | 17 -----------------
 TestsExample/src/Test1509v2/modals/index.tsx  |  9 ---------
 .../src/Test1509v2/screens/ScreenA.tsx        | 11 -----------
 .../src/Test1509v2/screens/ScreenB.tsx        | 12 ------------
 TestsExample/src/Test1509v2/screens/index.tsx | 12 ------------
 10 files changed, 1 insertion(+), 118 deletions(-)
 delete mode 100644 TestsExample/src/Test1509v2/ModalGroup.tsx
 delete mode 100644 TestsExample/src/Test1509v2/ScreenGroup.tsx
 delete mode 100644 TestsExample/src/Test1509v2/StackBuilder.tsx
 delete mode 100644 TestsExample/src/Test1509v2/index.tsx
 delete mode 100644 TestsExample/src/Test1509v2/modals/ModalA.tsx
 delete mode 100644 TestsExample/src/Test1509v2/modals/index.tsx
 delete mode 100644 TestsExample/src/Test1509v2/screens/ScreenA.tsx
 delete mode 100644 TestsExample/src/Test1509v2/screens/ScreenB.tsx
 delete mode 100644 TestsExample/src/Test1509v2/screens/index.tsx

diff --git a/TestsExample/App.js b/TestsExample/App.js
index ade87ba74c..5c1b13bb88 100644
--- a/TestsExample/App.js
+++ b/TestsExample/App.js
@@ -79,14 +79,13 @@ import Test1296 from './src/Test1296';
 import Test1299 from './src/Test1299';
 import Test1419 from './src/Test1419';
 import Test1509 from './src/Test1509';
-import Test1509v2 from './src/Test1509v2';
 
 enableFreeze(true);
 
 export default function App() {
   return (
     <ReanimatedScreenProvider>
-      <Test1509v2 />
+      <Test42 />
     </ReanimatedScreenProvider>
   );
 }
diff --git a/TestsExample/src/Test1509v2/ModalGroup.tsx b/TestsExample/src/Test1509v2/ModalGroup.tsx
deleted file mode 100644
index d7cb0bc5f5..0000000000
--- a/TestsExample/src/Test1509v2/ModalGroup.tsx
+++ /dev/null
@@ -1,9 +0,0 @@
-import StackBuilder from './StackBuilder';
-import Modals from './modals';
-
-
-export default StackBuilder(Modals, {
-  headerShown: false,
-  animation: 'fade_from_bottom',
-  presentation: 'containedTransparentModal',
-});
\ No newline at end of file
diff --git a/TestsExample/src/Test1509v2/ScreenGroup.tsx b/TestsExample/src/Test1509v2/ScreenGroup.tsx
deleted file mode 100644
index 795c2f3f38..0000000000
--- a/TestsExample/src/Test1509v2/ScreenGroup.tsx
+++ /dev/null
@@ -1,11 +0,0 @@
-import StackBuilder from './StackBuilder';
-import Screens from './screens';
-
-
-export default StackBuilder(Screens, {
-  headerShadowVisible: false,
-  headerTintColor: 'black',
-  headerBackTitleVisible: false,
-  fullScreenGestureEnabled: true,
-  contentStyle: { backgroundColor: 'white' },
-});
\ No newline at end of file
diff --git a/TestsExample/src/Test1509v2/StackBuilder.tsx b/TestsExample/src/Test1509v2/StackBuilder.tsx
deleted file mode 100644
index bf79a6472f..0000000000
--- a/TestsExample/src/Test1509v2/StackBuilder.tsx
+++ /dev/null
@@ -1,16 +0,0 @@
-import React from 'react';
-import { createNativeStackNavigator, NativeStackNavigationOptions } from '@react-navigation/native-stack';
-
-export const NativeStack = createNativeStackNavigator();
-
-export default (configs: any, groupOptions?: NativeStackNavigationOptions) => {
-  return () => (
-    <NativeStack.Group screenOptions={groupOptions}>
-      {configs.map(config => {
-        const { options, ...anyConfig } = config;
-        const { statusBarStyle, statusBarAnimation, statusBarHidden, ...anyOption } = options || {};
-        return <NativeStack.Screen key={config.name} {...anyConfig} options={anyOption} />;
-      })}
-    </NativeStack.Group>
-  );
-};
\ No newline at end of file
diff --git a/TestsExample/src/Test1509v2/index.tsx b/TestsExample/src/Test1509v2/index.tsx
deleted file mode 100644
index 8f66f334bf..0000000000
--- a/TestsExample/src/Test1509v2/index.tsx
+++ /dev/null
@@ -1,19 +0,0 @@
-import React from 'react';
-import {
-  NavigationContainer as NavigationContainerNative,
-} from '@react-navigation/native';
-
-import ModalGroup from './ModalGroup';
-import ScreenGroup from './ScreenGroup';
-import { NativeStack } from './StackBuilder';
-
-export default function TestModalPresentation() {
-  return (
-    <NavigationContainerNative>
-      <NativeStack.Navigator>
-        {ScreenGroup()}
-        {ModalGroup()}
-      </NativeStack.Navigator>
-    </NavigationContainerNative>
-  );
-}
\ No newline at end of file
diff --git a/TestsExample/src/Test1509v2/modals/ModalA.tsx b/TestsExample/src/Test1509v2/modals/ModalA.tsx
deleted file mode 100644
index 64eb6bef4c..0000000000
--- a/TestsExample/src/Test1509v2/modals/ModalA.tsx
+++ /dev/null
@@ -1,17 +0,0 @@
-import React from 'react';
-import { Button, Text, View } from 'react-native';
-
-type Props = {};
-
-export default function ModalA(props: Props) {
-  return (
-    <View style={{ flex: 1, backgroundColor: 'rgba(255,0,0,0.6)',alignItems: 'center', justifyContent: 'center'}}>
-      <View style={{backgroundColor: 'white'}}>
-
-      <Text>ModalA, with opacity and backgroundColor</Text>
-      <Text>At ModalA, we still can gesture swipe the screenB back to screenA, </Text>
-      <Button title={"pop modal"} onPress={() => props.navigation.pop()} />
-      </View>
-    </View>
-  );
-}
\ No newline at end of file
diff --git a/TestsExample/src/Test1509v2/modals/index.tsx b/TestsExample/src/Test1509v2/modals/index.tsx
deleted file mode 100644
index 9a7df758df..0000000000
--- a/TestsExample/src/Test1509v2/modals/index.tsx
+++ /dev/null
@@ -1,9 +0,0 @@
-import ModalA from './ModalA';
-
-export default [
-  {
-    name: 'modalA',
-    component: ModalA,
-    options: { animation: 'fade' },
-  }
-]
diff --git a/TestsExample/src/Test1509v2/screens/ScreenA.tsx b/TestsExample/src/Test1509v2/screens/ScreenA.tsx
deleted file mode 100644
index bed3c6a44e..0000000000
--- a/TestsExample/src/Test1509v2/screens/ScreenA.tsx
+++ /dev/null
@@ -1,11 +0,0 @@
-import React from 'react';
-import { Button, Text, View } from 'react-native';
-
-export default function ScreenA({navigation}) {
-  return (
-    <View style={{flex:1, backgroundColor: 'blue', alignItems: 'center', justifyContent: 'center'}} >
-      <Text style={{color: 'white'}}>ScreenA, with backgroundColor: 'blue'</Text>
-      <Button title={"navigate to: Screen B"} onPress={() => navigation.navigate('screenB')} />
-    </View>
-  );
-}
\ No newline at end of file
diff --git a/TestsExample/src/Test1509v2/screens/ScreenB.tsx b/TestsExample/src/Test1509v2/screens/ScreenB.tsx
deleted file mode 100644
index 9fb47551f2..0000000000
--- a/TestsExample/src/Test1509v2/screens/ScreenB.tsx
+++ /dev/null
@@ -1,12 +0,0 @@
-import React from 'react';
-import { Button, Text, View } from 'react-native';
-
-
-export default function ScreenB({navigation}) {
-  return (
-    <View style={{flex:1, backgroundColor: 'cyan', alignItems: 'center', justifyContent: 'center'}} >
-      <Text>ScreenB, with backgroundColor: 'cyan'</Text>
-      <Button title={"navigate to: Modal A"} onPress={() => navigation.navigate('modalA')} />
-    </View>
-  );
-}
\ No newline at end of file
diff --git a/TestsExample/src/Test1509v2/screens/index.tsx b/TestsExample/src/Test1509v2/screens/index.tsx
deleted file mode 100644
index 5de5d649dc..0000000000
--- a/TestsExample/src/Test1509v2/screens/index.tsx
+++ /dev/null
@@ -1,12 +0,0 @@
-import ScreenA from './ScreenA';
-import ScreenB from './ScreenB';
-export default [
-  {
-    name: 'screenA',
-    component: ScreenA,
-  },
-  {
-    name: 'screenB',
-    component: ScreenB,
-  }
-]
\ No newline at end of file