From 941ce5d1621d0fa36876926acad318915cfaaf8d Mon Sep 17 00:00:00 2001
From: WoLewicki <wojciech.lewicki@swmansion.com>
Date: Wed, 5 Jan 2022 16:27:21 +0100
Subject: [PATCH 1/8] feat: add transition duration on iOS

---
 TestsExample/App.js                        |  3 +-
 TestsExample/ios/Podfile.lock              |  4 +--
 TestsExample/src/Test.tsx                  | 33 ++++++++++++++++++++++
 guides/GUIDE_FOR_LIBRARY_AUTHORS.md        |  6 ++++
 ios/RNSScreen.h                            |  1 +
 ios/RNSScreen.m                            |  1 +
 ios/RNSScreenStackAnimator.m               |  2 +-
 native-stack/README.md                     |  6 ++++
 src/native-stack/types.tsx                 |  7 +++++
 src/native-stack/views/NativeStackView.tsx |  2 ++
 src/types.tsx                              |  7 +++++
 11 files changed, 68 insertions(+), 4 deletions(-)
 create mode 100644 TestsExample/src/Test.tsx

diff --git a/TestsExample/App.js b/TestsExample/App.js
index 01f7695342..e93867ddb6 100644
--- a/TestsExample/App.js
+++ b/TestsExample/App.js
@@ -73,13 +73,14 @@ import Test1209 from './src/Test1209';
 import Test1214 from './src/Test1214';
 import Test1227 from './src/Test1227';
 import Test1228 from './src/Test1228';
+import Test from './src/Test';
 
 enableFreeze(true);
 
 export default function App() {
   return (
     <ReanimatedScreenProvider>
-      <Test42 />
+      <Test />
     </ReanimatedScreenProvider>
   );
 }
diff --git a/TestsExample/ios/Podfile.lock b/TestsExample/ios/Podfile.lock
index b827ba79d2..f291f8dac9 100644
--- a/TestsExample/ios/Podfile.lock
+++ b/TestsExample/ios/Podfile.lock
@@ -376,7 +376,7 @@ PODS:
     - React-RCTVibration
     - ReactCommon/turbomodule/core
     - Yoga
-  - RNScreens (3.10.0):
+  - RNScreens (3.10.1):
     - React-Core
     - React-RCTImage
   - RNVectorIcons (7.1.0):
@@ -592,7 +592,7 @@ SPEC CHECKSUMS:
   RNCMaskedView: 5a8ec07677aa885546a0d98da336457e2bea557f
   RNGestureHandler: a479ebd5ed4221a810967000735517df0d2db211
   RNReanimated: b04ef2a4f0cb61b062bbcf033f84a9e470f4f60b
-  RNScreens: 03ba504f8c98607ad1f07808e71040e0afa335ec
+  RNScreens: 522705f2e5c9d27efb17f24aceb2bf8335bc7b8e
   RNVectorIcons: bc69e6a278b14842063605de32bec61f0b251a59
   Yoga: c11abbf5809216c91fcd62f5571078b83d9b6720
   YogaKit: f782866e155069a2cca2517aafea43200b01fd5a
diff --git a/TestsExample/src/Test.tsx b/TestsExample/src/Test.tsx
new file mode 100644
index 0000000000..85c8350810
--- /dev/null
+++ b/TestsExample/src/Test.tsx
@@ -0,0 +1,33 @@
+import * as React from 'react';
+import {Button} from 'react-native';
+import {NavigationContainer, ParamListBase} from '@react-navigation/native';
+import {createNativeStackNavigator, NativeStackNavigationProp} from 'react-native-screens/native-stack';
+
+const Stack = createNativeStackNavigator();
+
+export default function App() {
+  return (
+    <NavigationContainer>
+      <Stack.Navigator screenOptions={{transitionDuration: 2.0, stackAnimation: 'simple_push'}}>
+        <Stack.Screen name="First" component={First} />
+        <Stack.Screen
+          name="Second"
+          component={Second}
+        />
+      </Stack.Navigator>
+    </NavigationContainer>
+  );
+}
+
+function First({navigation}: {navigation: NativeStackNavigationProp<ParamListBase>}) {
+  return (
+    <Button title="Tap me for second screen" onPress={() => navigation.navigate('Second')} />
+
+  );
+}
+
+function Second({navigation}: {navigation: NativeStackNavigationProp<ParamListBase>}) {
+  return (
+    <Button title="Tap me for second screen" onPress={() => navigation.navigate('First')} />
+  );
+}
diff --git a/guides/GUIDE_FOR_LIBRARY_AUTHORS.md b/guides/GUIDE_FOR_LIBRARY_AUTHORS.md
index 9d425a9123..57c4b32dec 100644
--- a/guides/GUIDE_FOR_LIBRARY_AUTHORS.md
+++ b/guides/GUIDE_FOR_LIBRARY_AUTHORS.md
@@ -168,6 +168,12 @@ Defaults to `auto`.
 
 Sets the translucency of the status bar (similar to the `StatusBar` component). Defaults to `false`.
 
+#### `transitionDuration` (iOS only)
+
+Changes the duration of `slide_from_bottom`, `fade` and `simple_push` transitions on iOS. The `default` transition duration cannot be changed since it is not customizable, and the other ones have the duration values hardcoded to mimic the `Android` transition specs. 
+
+Defaults to `0.35`.
+
 #### `useTransitionProgress`
 
 Hook providing context value of transition progress of the current screen to be used with `react-native` `Animated`. It consists of 2 values:
diff --git a/ios/RNSScreen.h b/ios/RNSScreen.h
index 908fe6dfcb..362f453913 100644
--- a/ios/RNSScreen.h
+++ b/ios/RNSScreen.h
@@ -98,6 +98,7 @@ typedef NS_ENUM(NSInteger, RNSWindowTrait) {
 @property (nonatomic) BOOL hasStatusBarHiddenSet;
 @property (nonatomic) BOOL customAnimationOnSwipe;
 @property (nonatomic) BOOL fullScreenSwipeEnabled;
+@property (nonatomic, retain) NSNumber *transitionDuration;
 
 #if !TARGET_OS_TV
 @property (nonatomic) RNSStatusBarStyle statusBarStyle;
diff --git a/ios/RNSScreen.m b/ios/RNSScreen.m
index 0fbb86f88a..ca2253c602 100644
--- a/ios/RNSScreen.m
+++ b/ios/RNSScreen.m
@@ -771,6 +771,7 @@ @implementation RNSScreenManager
 RCT_EXPORT_VIEW_PROPERTY(replaceAnimation, RNSScreenReplaceAnimation)
 RCT_EXPORT_VIEW_PROPERTY(stackPresentation, RNSScreenStackPresentation)
 RCT_EXPORT_VIEW_PROPERTY(stackAnimation, RNSScreenStackAnimation)
+RCT_EXPORT_VIEW_PROPERTY(transitionDuration, NSNumber)
 
 RCT_EXPORT_VIEW_PROPERTY(onAppear, RCTDirectEventBlock);
 RCT_EXPORT_VIEW_PROPERTY(onDisappear, RCTDirectEventBlock);
diff --git a/ios/RNSScreenStackAnimator.m b/ios/RNSScreenStackAnimator.m
index 1b6efdbc0e..8a0d00501b 100644
--- a/ios/RNSScreenStackAnimator.m
+++ b/ios/RNSScreenStackAnimator.m
@@ -32,7 +32,7 @@ - (NSTimeInterval)transitionDuration:(id<UIViewControllerContextTransitioning>)t
   if (screen != nil && screen.stackAnimation == RNSScreenStackAnimationNone) {
     return 0;
   }
-  return _transitionDuration;
+  return screen.transitionDuration >= 0 ? [screen.transitionDuration floatValue] : _transitionDuration;
 }
 
 - (void)animateTransition:(id<UIViewControllerContextTransitioning>)transitionContext
diff --git a/native-stack/README.md b/native-stack/README.md
index 8c4b66f142..d8aa63a1f9 100644
--- a/native-stack/README.md
+++ b/native-stack/README.md
@@ -234,6 +234,12 @@ Using `containedModal` and `containedTransparentModal` with other types of modal
 
 A string that can be used as a fallback for `headerTitle`.
 
+#### `transitionDuration` (iOS only)
+
+Changes the duration of `slide_from_bottom`, `fade` and `simple_push` transitions on iOS. The `default` transition duration cannot be changed since it is not customizable, and the other ones have the duration values hardcoded to mimic the `Android` transition specs. 
+
+Defaults to `0.35`.
+
 #### `useTransitionProgress`
 
 Hook providing context value of transition progress of the current screen to be used with `react-native` `Animated`. It consists of 2 values:
diff --git a/src/native-stack/types.tsx b/src/native-stack/types.tsx
index f31b40abe4..c7beaa3414 100644
--- a/src/native-stack/types.tsx
+++ b/src/native-stack/types.tsx
@@ -329,6 +329,13 @@ export type NativeStackNavigationOptions = {
    * String that can be displayed in the header as a fallback for `headerTitle`.
    */
   title?: string;
+  /**
+   * Changes the duration of `slide_from_bottom`, `fade` and `simple_push` transitions on iOS. The `default` transition duration cannot be changed since it is not customizable, and the other ones have the duration values hardcoded to mimic the `Android` transition specs.
+   * Defaults to `0.35`.
+   *
+   * @platform ios
+   */
+  transitionDuration?: number;
 };
 
 export type NativeStackNavigatorProps = DefaultNavigatorOptions<
diff --git a/src/native-stack/views/NativeStackView.tsx b/src/native-stack/views/NativeStackView.tsx
index 123c815fcb..4925129e56 100644
--- a/src/native-stack/views/NativeStackView.tsx
+++ b/src/native-stack/views/NativeStackView.tsx
@@ -162,6 +162,7 @@ const RouteView = ({
     statusBarHidden,
     statusBarStyle,
     statusBarTranslucent,
+    transitionDuration,
   } = options;
 
   let { stackPresentation = 'push' } = options;
@@ -205,6 +206,7 @@ const RouteView = ({
       statusBarHidden={statusBarHidden}
       statusBarStyle={statusBarStyle}
       statusBarTranslucent={statusBarTranslucent}
+      transitionDuration={transitionDuration}
       onHeaderBackButtonClicked={() => {
         navigation.dispatch({
           ...StackActions.pop(),
diff --git a/src/types.tsx b/src/types.tsx
index 253489619f..6dfa06681e 100644
--- a/src/types.tsx
+++ b/src/types.tsx
@@ -214,6 +214,13 @@ export interface ScreenProps extends ViewProps {
    * @platform android
    */
   statusBarTranslucent?: boolean;
+  /**
+   * Changes the duration of `slide_from_bottom`, `fade` and `simple_push` transitions on iOS. The `default` transition duration cannot be changed since it is not customizable, and the other ones have the duration values hardcoded to mimic the `Android` transition specs.
+   * Defaults to `0.35`.
+   *
+   * @platform ios
+   */
+  transitionDuration?: number;
 }
 
 export interface ScreenContainerProps extends ViewProps {

From 3df9e40ee4039c9ff5d2744d3b1b0445d251fd5a Mon Sep 17 00:00:00 2001
From: WoLewicki <wojciech.lewicki@swmansion.com>
Date: Wed, 5 Jan 2022 16:30:20 +0100
Subject: [PATCH 2/8] feat: add test number

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

diff --git a/TestsExample/App.js b/TestsExample/App.js
index e93867ddb6..1ed822a326 100644
--- a/TestsExample/App.js
+++ b/TestsExample/App.js
@@ -73,14 +73,14 @@ import Test1209 from './src/Test1209';
 import Test1214 from './src/Test1214';
 import Test1227 from './src/Test1227';
 import Test1228 from './src/Test1228';
-import Test from './src/Test';
+import Test1259 from './src/Test1259';
 
 enableFreeze(true);
 
 export default function App() {
   return (
     <ReanimatedScreenProvider>
-      <Test />
+      <Test42 />
     </ReanimatedScreenProvider>
   );
 }
diff --git a/TestsExample/src/Test.tsx b/TestsExample/src/Test1259.tsx
similarity index 100%
rename from TestsExample/src/Test.tsx
rename to TestsExample/src/Test1259.tsx

From 5e962ea9ffb6d35f4db784a7bc82950538ae6b7a Mon Sep 17 00:00:00 2001
From: kacperkapusciak <kacper.kapusciak@swmansion.com>
Date: Mon, 7 Feb 2022 12:34:27 +0100
Subject: [PATCH 3/8] feat: add transition duration to fade_from_bottom

---
 ios/RNSScreenStackAnimator.m | 46 ++++++++++++++++++++++++++++++------
 1 file changed, 39 insertions(+), 7 deletions(-)

diff --git a/ios/RNSScreenStackAnimator.m b/ios/RNSScreenStackAnimator.m
index 8a0d00501b..c0d2a1cfb8 100644
--- a/ios/RNSScreenStackAnimator.m
+++ b/ios/RNSScreenStackAnimator.m
@@ -11,7 +11,7 @@ - (instancetype)initWithOperation:(UINavigationControllerOperation)operation
 {
   if (self = [super init]) {
     _operation = operation;
-    _transitionDuration = 0.35; // default duration
+    _transitionDuration = 0.35; // default duration in seconds
   }
   return self;
 }
@@ -32,7 +32,13 @@ - (NSTimeInterval)transitionDuration:(id<UIViewControllerContextTransitioning>)t
   if (screen != nil && screen.stackAnimation == RNSScreenStackAnimationNone) {
     return 0;
   }
-  return screen.transitionDuration >= 0 ? [screen.transitionDuration floatValue] : _transitionDuration;
+
+  if (screen != nil && screen.transitionDuration != nil && [screen.transitionDuration floatValue] >= 0) {
+    float durationInSeconds = [screen.transitionDuration floatValue] / 1000.0;
+    return durationInSeconds;
+  }
+
+  return _transitionDuration;
 }
 
 - (void)animateTransition:(id<UIViewControllerContextTransitioning>)transitionContext
@@ -202,14 +208,30 @@ - (void)animateFadeFromBottomWithTransitionContext:(id<UIViewControllerContextTr
   CGAffineTransform topBottomTransform =
       CGAffineTransformMakeTranslation(0, 0.08 * transitionContext.containerView.bounds.size.height);
 
+  // proportions to default transition duration
+  NSDictionary *proportionToDefaultTransitionDuration = @{
+    @"slideOpen" : @1, // 0.35 s
+    @"fadeOpen" : @0.571, // 0.2 s
+    @"slideClose" : @0.714, // 0.25
+    @"fadeClose" : @0.428, // 0.15
+    @"fadeCloseDelay" : @0.286, // 0.1
+  };
+
   if (_operation == UINavigationControllerOperationPush) {
     toViewController.view.transform = topBottomTransform;
     toViewController.view.alpha = 0.0;
     [[transitionContext containerView] addSubview:toViewController.view];
 
+    // defaults to 0.35 s
+    float slideOpenTransitionDuration =
+        [self transitionDuration:transitionContext] * [proportionToDefaultTransitionDuration[@"slideOpen"] floatValue];
+    // defaults to 0.2 s
+    float fadeOpenTransitionDuration =
+        [self transitionDuration:transitionContext] * [proportionToDefaultTransitionDuration[@"fadeOpen"] floatValue];
+
     // Android Nougat open animation
     // http://aosp.opersys.com/xref/android-7.1.2_r37/xref/frameworks/base/core/res/res/anim/activity_open_enter.xml
-    [UIView animateWithDuration:0.35
+    [UIView animateWithDuration:slideOpenTransitionDuration
         delay:0
         options:UIViewAnimationOptionCurveEaseOut
         animations:^{
@@ -220,7 +242,7 @@ - (void)animateFadeFromBottomWithTransitionContext:(id<UIViewControllerContextTr
           fromViewController.view.transform = CGAffineTransformIdentity;
           [transitionContext completeTransition:![transitionContext transitionWasCancelled]];
         }];
-    [UIView animateWithDuration:0.2
+    [UIView animateWithDuration:fadeOpenTransitionDuration
                           delay:0
                         options:UIViewAnimationOptionCurveEaseOut
                      animations:^{
@@ -232,9 +254,19 @@ - (void)animateFadeFromBottomWithTransitionContext:(id<UIViewControllerContextTr
     toViewController.view.transform = CGAffineTransformIdentity;
     [[transitionContext containerView] insertSubview:toViewController.view belowSubview:fromViewController.view];
 
+    // defaults to 0.25 s
+    float slideCloseTransitionDuration =
+        [self transitionDuration:transitionContext] * [proportionToDefaultTransitionDuration[@"slideClose"] floatValue];
+    // defaults to 0.15 s
+    float fadeCloseTransitionDuration =
+        [self transitionDuration:transitionContext] * [proportionToDefaultTransitionDuration[@"fadeClose"] floatValue];
+    // defaults to 0.1 s
+    float fadeCloseDelayDuration = [self transitionDuration:transitionContext] *
+        [proportionToDefaultTransitionDuration[@"fadeCloseDelay"] floatValue];
+
     // Android Nougat exit animation
     // http://aosp.opersys.com/xref/android-7.1.2_r37/xref/frameworks/base/core/res/res/anim/activity_close_exit.xml
-    [UIView animateWithDuration:0.25
+    [UIView animateWithDuration:slideCloseTransitionDuration
         delay:0
         options:UIViewAnimationOptionCurveEaseIn
         animations:^{
@@ -244,8 +276,8 @@ - (void)animateFadeFromBottomWithTransitionContext:(id<UIViewControllerContextTr
         completion:^(BOOL finished) {
           [transitionContext completeTransition:![transitionContext transitionWasCancelled]];
         }];
-    [UIView animateWithDuration:0.15
-                          delay:0.1
+    [UIView animateWithDuration:fadeCloseTransitionDuration
+                          delay:fadeCloseDelayDuration
                         options:UIViewAnimationOptionCurveLinear
                      animations:^{
                        fromViewController.view.alpha = 0.0;

From 106dabab458ee250e9fab55a39d44e04b8f9cb72 Mon Sep 17 00:00:00 2001
From: kacperkapusciak <kacper.kapusciak@swmansion.com>
Date: Mon, 7 Feb 2022 13:06:34 +0100
Subject: [PATCH 4/8] docs: reword transition duration description

---
 guides/GUIDE_FOR_LIBRARY_AUTHORS.md | 4 ++--
 native-stack/README.md              | 4 ++--
 src/native-stack/types.tsx          | 4 ++--
 src/types.tsx                       | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/guides/GUIDE_FOR_LIBRARY_AUTHORS.md b/guides/GUIDE_FOR_LIBRARY_AUTHORS.md
index 57c4b32dec..7ccca813bd 100644
--- a/guides/GUIDE_FOR_LIBRARY_AUTHORS.md
+++ b/guides/GUIDE_FOR_LIBRARY_AUTHORS.md
@@ -170,9 +170,9 @@ Sets the translucency of the status bar (similar to the `StatusBar` component).
 
 #### `transitionDuration` (iOS only)
 
-Changes the duration of `slide_from_bottom`, `fade` and `simple_push` transitions on iOS. The `default` transition duration cannot be changed since it is not customizable, and the other ones have the duration values hardcoded to mimic the `Android` transition specs. 
+Changes the duration (in milliseconds) of `slide_from_bottom`, `fade_from_bottom`, `fade` and `simple_push` transitions on iOS. The duration of `default` and `flip` transitions isn't customizable. 
 
-Defaults to `0.35`.
+Defaults to `350`.
 
 #### `useTransitionProgress`
 
diff --git a/native-stack/README.md b/native-stack/README.md
index d8aa63a1f9..2072ad4a0c 100644
--- a/native-stack/README.md
+++ b/native-stack/README.md
@@ -236,9 +236,9 @@ A string that can be used as a fallback for `headerTitle`.
 
 #### `transitionDuration` (iOS only)
 
-Changes the duration of `slide_from_bottom`, `fade` and `simple_push` transitions on iOS. The `default` transition duration cannot be changed since it is not customizable, and the other ones have the duration values hardcoded to mimic the `Android` transition specs. 
+Changes the duration (in milliseconds) of `slide_from_bottom`, `fade_from_bottom`, `fade` and `simple_push` transitions on iOS. The duration of `default` and `flip` transitions isn't customizable. 
 
-Defaults to `0.35`.
+Defaults to `350`.
 
 #### `useTransitionProgress`
 
diff --git a/src/native-stack/types.tsx b/src/native-stack/types.tsx
index c7beaa3414..c844a8d2f8 100644
--- a/src/native-stack/types.tsx
+++ b/src/native-stack/types.tsx
@@ -330,8 +330,8 @@ export type NativeStackNavigationOptions = {
    */
   title?: string;
   /**
-   * Changes the duration of `slide_from_bottom`, `fade` and `simple_push` transitions on iOS. The `default` transition duration cannot be changed since it is not customizable, and the other ones have the duration values hardcoded to mimic the `Android` transition specs.
-   * Defaults to `0.35`.
+   * Changes the duration (in milliseconds) of `slide_from_bottom`, `fade_from_bottom`, `fade` and `simple_push` transitions on iOS.
+   * The duration of `default` and `flip` transitions isn't customizable. Defaults to `350`.
    *
    * @platform ios
    */
diff --git a/src/types.tsx b/src/types.tsx
index 6dfa06681e..37b0d27d2b 100644
--- a/src/types.tsx
+++ b/src/types.tsx
@@ -215,8 +215,8 @@ export interface ScreenProps extends ViewProps {
    */
   statusBarTranslucent?: boolean;
   /**
-   * Changes the duration of `slide_from_bottom`, `fade` and `simple_push` transitions on iOS. The `default` transition duration cannot be changed since it is not customizable, and the other ones have the duration values hardcoded to mimic the `Android` transition specs.
-   * Defaults to `0.35`.
+   * Changes the duration (in milliseconds) of `slide_from_bottom`, `fade_from_bottom`, `fade` and `simple_push` transitions on iOS.
+   * The duration of `default` and `flip` transitions isn't customizable. Defaults to `350`.
    *
    * @platform ios
    */

From 71d3e50e452986d4efff7b03c7fdfaf2362e1f00 Mon Sep 17 00:00:00 2001
From: kacperkapusciak <kacper.kapusciak@swmansion.com>
Date: Mon, 7 Feb 2022 13:07:56 +0100
Subject: [PATCH 5/8] chore: reformat example

---
 TestsExample/src/Test1259.tsx | 39 +++++++++++++++++++++++++----------
 1 file changed, 28 insertions(+), 11 deletions(-)

diff --git a/TestsExample/src/Test1259.tsx b/TestsExample/src/Test1259.tsx
index 85c8350810..ff46b6ab06 100644
--- a/TestsExample/src/Test1259.tsx
+++ b/TestsExample/src/Test1259.tsx
@@ -1,33 +1,50 @@
 import * as React from 'react';
 import {Button} from 'react-native';
 import {NavigationContainer, ParamListBase} from '@react-navigation/native';
-import {createNativeStackNavigator, NativeStackNavigationProp} from 'react-native-screens/native-stack';
+import {
+  createNativeStackNavigator,
+  NativeStackNavigationProp,
+} from 'react-native-screens/native-stack';
 
 const Stack = createNativeStackNavigator();
 
 export default function App() {
   return (
     <NavigationContainer>
-      <Stack.Navigator screenOptions={{transitionDuration: 2.0, stackAnimation: 'simple_push'}}>
+      <Stack.Navigator
+        screenOptions={{
+          transitionDuration: 2000,
+          stackAnimation: 'slide_from_bottom',
+        }}>
         <Stack.Screen name="First" component={First} />
-        <Stack.Screen
-          name="Second"
-          component={Second}
-        />
+        <Stack.Screen name="Second" component={Second} />
       </Stack.Navigator>
     </NavigationContainer>
   );
 }
 
-function First({navigation}: {navigation: NativeStackNavigationProp<ParamListBase>}) {
+function First({
+  navigation,
+}: {
+  navigation: NativeStackNavigationProp<ParamListBase>;
+}) {
   return (
-    <Button title="Tap me for second screen" onPress={() => navigation.navigate('Second')} />
-
+    <Button
+      title="Tap me for second screen"
+      onPress={() => navigation.navigate('Second')}
+    />
   );
 }
 
-function Second({navigation}: {navigation: NativeStackNavigationProp<ParamListBase>}) {
+function Second({
+  navigation,
+}: {
+  navigation: NativeStackNavigationProp<ParamListBase>;
+}) {
   return (
-    <Button title="Tap me for second screen" onPress={() => navigation.navigate('First')} />
+    <Button
+      title="Tap me for second screen"
+      onPress={() => navigation.navigate('First')}
+    />
   );
 }

From 750555d36f522d567b9a08ac16e582960e05a370 Mon Sep 17 00:00:00 2001
From: kacperkapusciak <kacper.kapusciak@swmansion.com>
Date: Mon, 7 Feb 2022 13:15:16 +0100
Subject: [PATCH 6/8] fix: add seconds in comments

---
 ios/RNSScreenStackAnimator.m | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ios/RNSScreenStackAnimator.m b/ios/RNSScreenStackAnimator.m
index c0d2a1cfb8..27795b4d71 100644
--- a/ios/RNSScreenStackAnimator.m
+++ b/ios/RNSScreenStackAnimator.m
@@ -212,9 +212,9 @@ - (void)animateFadeFromBottomWithTransitionContext:(id<UIViewControllerContextTr
   NSDictionary *proportionToDefaultTransitionDuration = @{
     @"slideOpen" : @1, // 0.35 s
     @"fadeOpen" : @0.571, // 0.2 s
-    @"slideClose" : @0.714, // 0.25
-    @"fadeClose" : @0.428, // 0.15
-    @"fadeCloseDelay" : @0.286, // 0.1
+    @"slideClose" : @0.714, // 0.25 s
+    @"fadeClose" : @0.428, // 0.15 s
+    @"fadeCloseDelay" : @0.286, // 0.1 s
   };
 
   if (_operation == UINavigationControllerOperationPush) {

From 9c3d520007bd368e2346d924448d889911c52a2d Mon Sep 17 00:00:00 2001
From: kacperkapusciak <kacper.kapusciak@swmansion.com>
Date: Mon, 7 Feb 2022 13:29:31 +0100
Subject: [PATCH 7/8] docs: change sentence order

---
 guides/GUIDE_FOR_LIBRARY_AUTHORS.md | 4 ++--
 native-stack/README.md              | 4 ++--
 src/native-stack/types.tsx          | 4 ++--
 src/types.tsx                       | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/guides/GUIDE_FOR_LIBRARY_AUTHORS.md b/guides/GUIDE_FOR_LIBRARY_AUTHORS.md
index 7dc212dfb1..b63ec7c978 100644
--- a/guides/GUIDE_FOR_LIBRARY_AUTHORS.md
+++ b/guides/GUIDE_FOR_LIBRARY_AUTHORS.md
@@ -182,9 +182,9 @@ Sets the translucency of the status bar (similar to the `StatusBar` component).
 
 ### `transitionDuration` (iOS only)
 
-Changes the duration (in milliseconds) of `slide_from_bottom`, `fade_from_bottom`, `fade` and `simple_push` transitions on iOS. The duration of `default` and `flip` transitions isn't customizable. 
+Changes the duration (in milliseconds) of `slide_from_bottom`, `fade_from_bottom`, `fade` and `simple_push` transitions on iOS. Defaults to `350`.
 
-Defaults to `350`.
+The duration of `default` and `flip` transitions isn't customizable.
 
 ### `useTransitionProgress`
 
diff --git a/native-stack/README.md b/native-stack/README.md
index 9898896aa5..37e500b945 100644
--- a/native-stack/README.md
+++ b/native-stack/README.md
@@ -248,9 +248,9 @@ A string that can be used as a fallback for `headerTitle`.
 
 #### `transitionDuration` (iOS only)
 
-Changes the duration (in milliseconds) of `slide_from_bottom`, `fade_from_bottom`, `fade` and `simple_push` transitions on iOS. The duration of `default` and `flip` transitions isn't customizable. 
+Changes the duration (in milliseconds) of `slide_from_bottom`, `fade_from_bottom`, `fade` and `simple_push` transitions on iOS. Defaults to `350`.
 
-Defaults to `350`.
+The duration of `default` and `flip` transitions isn't customizable.
 
 #### `useTransitionProgress`
 
diff --git a/src/native-stack/types.tsx b/src/native-stack/types.tsx
index 5919e92620..aa521d2097 100644
--- a/src/native-stack/types.tsx
+++ b/src/native-stack/types.tsx
@@ -348,8 +348,8 @@ export type NativeStackNavigationOptions = {
    */
   title?: string;
   /**
-   * Changes the duration (in milliseconds) of `slide_from_bottom`, `fade_from_bottom`, `fade` and `simple_push` transitions on iOS.
-   * The duration of `default` and `flip` transitions isn't customizable. Defaults to `350`.
+   * Changes the duration (in milliseconds) of `slide_from_bottom`, `fade_from_bottom`, `fade` and `simple_push` transitions on iOS. Defaults to `350`.
+   * The duration of `default` and `flip` transitions isn't customizable.
    *
    * @platform ios
    */
diff --git a/src/types.tsx b/src/types.tsx
index 56d3076fdd..09e6f5ab99 100644
--- a/src/types.tsx
+++ b/src/types.tsx
@@ -233,8 +233,8 @@ export interface ScreenProps extends ViewProps {
    */
   statusBarTranslucent?: boolean;
   /**
-   * Changes the duration (in milliseconds) of `slide_from_bottom`, `fade_from_bottom`, `fade` and `simple_push` transitions on iOS.
-   * The duration of `default` and `flip` transitions isn't customizable. Defaults to `350`.
+   * Changes the duration (in milliseconds) of `slide_from_bottom`, `fade_from_bottom`, `fade` and `simple_push` transitions on iOS. Defaults to `350`.
+   * The duration of `default` and `flip` transitions isn't customizable.
    *
    * @platform ios
    */

From 23b136a1f04361931181c4225dc4b24463d079ba Mon Sep 17 00:00:00 2001
From: kacperkapusciak <kacper.kapusciak@swmansion.com>
Date: Mon, 7 Feb 2022 13:44:25 +0100
Subject: [PATCH 8/8] =?UTF-8?q?fix:=20write=20proportions=20explicitly=20(?=
 =?UTF-8?q?=EF=BC=8D=E2=80=B8=E1=83=9A)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ios/RNSScreenStackAnimator.m | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/ios/RNSScreenStackAnimator.m b/ios/RNSScreenStackAnimator.m
index 27795b4d71..103181919c 100644
--- a/ios/RNSScreenStackAnimator.m
+++ b/ios/RNSScreenStackAnimator.m
@@ -210,11 +210,11 @@ - (void)animateFadeFromBottomWithTransitionContext:(id<UIViewControllerContextTr
 
   // proportions to default transition duration
   NSDictionary *proportionToDefaultTransitionDuration = @{
-    @"slideOpen" : @1, // 0.35 s
-    @"fadeOpen" : @0.571, // 0.2 s
-    @"slideClose" : @0.714, // 0.25 s
-    @"fadeClose" : @0.428, // 0.15 s
-    @"fadeCloseDelay" : @0.286, // 0.1 s
+    @"slideOpen" : @1,
+    @"fadeOpen" : @(0.2 / 0.35),
+    @"slideClose" : @(0.25 / 0.35),
+    @"fadeClose" : @(0.15 / 0.35),
+    @"fadeCloseDelay" : @(0.1 / 0.35),
   };
 
   if (_operation == UINavigationControllerOperationPush) {