From a6b2ab9462e6b5cd428c88c5f21f2a8bd1d832fc Mon Sep 17 00:00:00 2001
From: Wojciech Lewicki <wojciech.lewicki@swmansion.com>
Date: Thu, 21 Apr 2022 16:07:44 +0200
Subject: [PATCH 1/4] feat: add prop for hiding keyboard on swipe

---
 TestsExample/App.js                        |  3 +-
 TestsExample/src/Test.tsx                  | 77 ++++++++++++++++++++++
 ios/RNSScreen.h                            |  1 +
 ios/RNSScreen.m                            |  4 ++
 src/native-stack/types.tsx                 |  6 ++
 src/native-stack/views/NativeStackView.tsx |  2 +
 src/types.tsx                              |  6 ++
 7 files changed, 98 insertions(+), 1 deletion(-)
 create mode 100644 TestsExample/src/Test.tsx

diff --git a/TestsExample/App.js b/TestsExample/App.js
index ed0b86501a..ddbbbbcb5a 100644
--- a/TestsExample/App.js
+++ b/TestsExample/App.js
@@ -78,13 +78,14 @@ import Test1259 from './src/Test1259';
 import Test1260 from './src/Test1260';
 import Test1296 from './src/Test1296';
 import Test1299 from './src/Test1299';
+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..edbc598cd8
--- /dev/null
+++ b/TestsExample/src/Test.tsx
@@ -0,0 +1,77 @@
+import React from 'react';
+import { View, Text, Button, KeyboardAvoidingView, Platform, TouchableWithoutFeedback, Keyboard, Image, TextInput } from 'react-native';
+import {NavigationContainer, ParamListBase} from '@react-navigation/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={'Navigate'}
+        onPress={() => navigation.navigate('Second')}
+      />
+    </View>
+  );
+}
+
+function Second() {
+  return (
+    <KeyboardAvoidingView
+    behavior={Platform.OS === 'ios' ? 'padding' : 'height'}
+    style={{ flex: 1 }}
+    >
+      <TouchableWithoutFeedback onPress={Keyboard.dismiss}>
+        <View style={{
+          flex: 1,
+          alignItems: 'center',
+          justifyContent: 'center'
+        }}>
+          <Image
+            source={require('../assets/backButton.png')}
+            style={{
+              width: 150,
+              height: 150,
+              marginBottom: 30
+            }}
+          />
+          <TextInput
+            placeholder={'Input'}
+            style={{
+              width: 200,
+              height: 40,
+              paddingLeft: 15,
+              paddingRight: 15,
+              borderWidth: 1,
+              borderRadius: 5,
+              borderColor: '#cccccc'
+            }}
+          />
+        </View>
+      </TouchableWithoutFeedback>
+    </KeyboardAvoidingView>
+  );
+}
+
+const { Navigator, Screen } = createNativeStackNavigator();
+
+export default () => {
+  return (
+    <NavigationContainer>
+        <Navigator screenOptions={{hideKeyboardOnSwipe: true}}>
+        <Screen
+            name={'First'}
+            component={First}
+        />
+        <Screen
+            name={'Second'}
+            component={Second}
+        />
+        </Navigator>
+    </NavigationContainer>
+  );
+}
diff --git a/ios/RNSScreen.h b/ios/RNSScreen.h
index a3a07075df..c55fd45900 100644
--- a/ios/RNSScreen.h
+++ b/ios/RNSScreen.h
@@ -58,6 +58,7 @@
 @property (nonatomic) BOOL fullScreenSwipeEnabled;
 @property (nonatomic, copy) NSDictionary *gestureResponseDistance;
 @property (nonatomic, retain) NSNumber *transitionDuration;
+@property (nonatomic) BOOL hideKeyboardOnSwipe;
 
 #if !TARGET_OS_TV
 @property (nonatomic) RNSStatusBarStyle statusBarStyle;
diff --git a/ios/RNSScreen.m b/ios/RNSScreen.m
index 60423084f9..cafc7dfac1 100644
--- a/ios/RNSScreen.m
+++ b/ios/RNSScreen.m
@@ -259,6 +259,9 @@ - (void)notifyWillAppear
 
 - (void)notifyWillDisappear
 {
+  if (_hideKeyboardOnSwipe) {
+    [self endEditing:YES];
+  }
   if (self.onWillDisappear) {
     self.onWillDisappear(nil);
   }
@@ -792,6 +795,7 @@ @implementation RNSScreenManager
 RCT_EXPORT_VIEW_PROPERTY(fullScreenSwipeEnabled, BOOL);
 RCT_EXPORT_VIEW_PROPERTY(gestureEnabled, BOOL)
 RCT_EXPORT_VIEW_PROPERTY(gestureResponseDistance, NSDictionary)
+RCT_EXPORT_VIEW_PROPERTY(hideKeyboardOnSwipe, BOOL)
 RCT_EXPORT_VIEW_PROPERTY(preventNativeDismiss, BOOL)
 RCT_EXPORT_VIEW_PROPERTY(replaceAnimation, RNSScreenReplaceAnimation)
 RCT_EXPORT_VIEW_PROPERTY(stackPresentation, RNSScreenStackPresentation)
diff --git a/src/native-stack/types.tsx b/src/native-stack/types.tsx
index 3984303dad..0dfcff2003 100644
--- a/src/native-stack/types.tsx
+++ b/src/native-stack/types.tsx
@@ -255,6 +255,12 @@ export type NativeStackNavigationOptions = {
    * @platform ios
    */
   homeIndicatorHidden?: boolean;
+  /**
+   * Whether the keyboard should hide when swiping to the previous screen. Defaults to `false`.
+   *
+   * @platform ios
+   */
+  hideKeyboardOnSwipe?: boolean;
   /**
    * Boolean indicating whether, when the Android default back button is clicked, the `pop` action should be performed on the native side or on the JS side to be able to prevent it.
    * Unfortunately the same behavior is not available on iOS since the behavior of native back button cannot be changed there.
diff --git a/src/native-stack/views/NativeStackView.tsx b/src/native-stack/views/NativeStackView.tsx
index 896f5cdcde..55f6580893 100644
--- a/src/native-stack/views/NativeStackView.tsx
+++ b/src/native-stack/views/NativeStackView.tsx
@@ -152,6 +152,7 @@ const RouteView = ({
     gestureEnabled,
     gestureResponseDistance,
     headerShown,
+    hideKeyboardOnSwipe,
     homeIndicatorHidden,
     nativeBackButtonDismissalEnabled = false,
     navigationBarColor,
@@ -219,6 +220,7 @@ const RouteView = ({
       style={StyleSheet.absoluteFill}
       customAnimationOnSwipe={customAnimationOnSwipe}
       fullScreenSwipeEnabled={fullScreenSwipeEnabled}
+      hideKeyboardOnSwipe={hideKeyboardOnSwipe}
       homeIndicatorHidden={homeIndicatorHidden}
       gestureEnabled={isAndroid ? false : gestureEnabled}
       gestureResponseDistance={gestureResponseDistance}
diff --git a/src/types.tsx b/src/types.tsx
index 5ceda97c4f..9df604dfb3 100644
--- a/src/types.tsx
+++ b/src/types.tsx
@@ -121,6 +121,12 @@ export interface ScreenProps extends ViewProps {
    * @platform ios
    */
   homeIndicatorHidden?: boolean;
+  /**
+   * Whether the keyboard should hide when swiping to the previous screen. Defaults to `false`.
+   *
+   * @platform ios
+   */
+  hideKeyboardOnSwipe?: boolean;
   /**
    * Boolean indicating whether, when the Android default back button is clicked, the `pop` action should be performed on the native side or on the JS side to be able to prevent it.
    * Unfortunately the same behavior is not available on iOS since the behavior of native back button cannot be changed there.

From 472605680ab93f78779c820fd0eec9212494a169 Mon Sep 17 00:00:00 2001
From: Wojciech Lewicki <wojciech.lewicki@swmansion.com>
Date: Thu, 21 Apr 2022 16:11:33 +0200
Subject: [PATCH 2/4] feat: add test number

---
 TestsExample/App.js                         | 4 ++--
 TestsExample/src/{Test.tsx => Test1419.tsx} | 0
 2 files changed, 2 insertions(+), 2 deletions(-)
 rename TestsExample/src/{Test.tsx => Test1419.tsx} (100%)

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

From 4b93ad7d8e5bfa07b14158654abb5b98aa2a5079 Mon Sep 17 00:00:00 2001
From: Wojciech Lewicki <wojciech.lewicki@swmansion.com>
Date: Thu, 21 Apr 2022 16:15:04 +0200
Subject: [PATCH 3/4] feat: add readmes

---
 guides/GUIDE_FOR_LIBRARY_AUTHORS.md | 7 ++++++-
 native-stack/README.md              | 4 ++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/guides/GUIDE_FOR_LIBRARY_AUTHORS.md b/guides/GUIDE_FOR_LIBRARY_AUTHORS.md
index f54252385e..8bddd502a3 100644
--- a/guides/GUIDE_FOR_LIBRARY_AUTHORS.md
+++ b/guides/GUIDE_FOR_LIBRARY_AUTHORS.md
@@ -60,7 +60,12 @@ gestureResponseDistance: {
   bottom: 150,
 }
 ```
-### `homeIndicatorHidden` (iOS only)
+
+###  `hideKeyboardOnSwipe` (iOS only)
+
+Whether the keyboard should hide when swiping to the previous screen. Defaults to `false`.
+
+### `homeIndicatorHidden`
 
 Whether the home indicator should be hidden on this screen. Defaults to `false`.
 
diff --git a/native-stack/README.md b/native-stack/README.md
index f98434d468..32a9b87893 100644
--- a/native-stack/README.md
+++ b/native-stack/README.md
@@ -195,6 +195,10 @@ A Boolean to that lets you opt out of insetting the header. You may want to * se
 
 Boolean indicating whether the navigation bar is translucent.
 
+####  `hideKeyboardOnSwipe` (iOS only)
+
+Whether the keyboard should hide when swiping to the previous screen. Defaults to `false`.
+
 #### `homeIndicatorHidden` (iOS only)
 
 Whether the home indicator should be hidden on this screen. Defaults to `false`.

From ec87d424bfbda0a8f7afcbdd657c4323c5171c44 Mon Sep 17 00:00:00 2001
From: Wojciech Lewicki <wojciech.lewicki@swmansion.com>
Date: Fri, 22 Apr 2022 09:54:44 +0200
Subject: [PATCH 4/4] fix: typo

---
 guides/GUIDE_FOR_LIBRARY_AUTHORS.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/guides/GUIDE_FOR_LIBRARY_AUTHORS.md b/guides/GUIDE_FOR_LIBRARY_AUTHORS.md
index 8bddd502a3..1b99675f1d 100644
--- a/guides/GUIDE_FOR_LIBRARY_AUTHORS.md
+++ b/guides/GUIDE_FOR_LIBRARY_AUTHORS.md
@@ -65,7 +65,7 @@ gestureResponseDistance: {
 
 Whether the keyboard should hide when swiping to the previous screen. Defaults to `false`.
 
-### `homeIndicatorHidden`
+### `homeIndicatorHidden` (iOS only)
 
 Whether the home indicator should be hidden on this screen. Defaults to `false`.