Merge branch 'master' into add-architecture-documentation

Author: yedidyak

Mock.ts

@@ -36,6 +36,7 @@ extern const NSInteger BLUR_TOPBAR_TAG;
 @property(nonatomic, strong) WindowOptions *window;
 
 @property(nonatomic, strong) Bool *popGesture;
+@property(nonatomic, strong) Bool *navigationButtonEventOnSwipeBack;
 @property(nonatomic, strong) Image *backgroundImage;
 @property(nonatomic, strong) Image *rootBackgroundImage;
 @property(nonatomic, strong) Text *modalPresentationStyle;

ios/RNNNavigationOptions.h

@@ -41,6 +41,7 @@ - (instancetype)initWithDict:(NSDictionary *)dict {
     self.window = [[WindowOptions alloc] initWithDict:dict[@"window"]];
 
     self.popGesture = [[Bool alloc] initWithValue:dict[@"popGesture"]];
+    self.navigationButtonEventOnSwipeBack = [[Bool alloc] initWithValue:dict[@"navigationButtonEventOnSwipeBack"]];
     self.backgroundImage = [ImageParser parse:dict key:@"backgroundImage"];
     self.rootBackgroundImage = [ImageParser parse:dict key:@"rootBackgroundImage"];
     self.modalPresentationStyle = [[Text alloc] initWithValue:dict[@"modalPresentationStyle"]];
@@ -73,6 +74,8 @@ - (RNNNavigationOptions *)mergeOptions:(RNNNavigationOptions *)options {
 
     if (options.popGesture.hasValue)
         result.popGesture = options.popGesture;
+    if (options.navigationButtonEventOnSwipeBack.hasValue)
+        result.navigationButtonEventOnSwipeBack = options.navigationButtonEventOnSwipeBack;
     if (options.backgroundImage.hasValue)
         result.backgroundImage = options.backgroundImage;
     if (options.rootBackgroundImage.hasValue)
@@ -104,6 +107,7 @@ - (RNNNavigationOptions *)copy {
     [newOptions.window mergeOptions:self.window];
 
     newOptions.popGesture = self.popGesture;
+    newOptions.navigationButtonEventOnSwipeBack = self.navigationButtonEventOnSwipeBack;
     newOptions.backgroundImage = self.backgroundImage;
     newOptions.rootBackgroundImage = self.rootBackgroundImage;
     newOptions.modalPresentationStyle = self.modalPresentationStyle;

ios/RNNNavigationOptions.mm

@@ -75,21 +75,13 @@ - (void)animateTransition:(id<UIViewControllerContextTransitioning>)transitionCo
 }
 
 - (void)prepareTransitionContext:(id<UIViewControllerContextTransitioning>)transitionContext {
-    UIViewController *fromViewController =
-    [transitionContext viewControllerForKey:UITransitionContextFromViewControllerKey];
     UIViewController *toViewController =
     [transitionContext viewControllerForKey:UITransitionContextToViewControllerKey];
 
     UIView *fromView = [transitionContext viewForKey:UITransitionContextFromViewKey];
     UIView *toView = [transitionContext viewForKey:UITransitionContextToViewKey];
 
-    BOOL isDismiss = (toView == nil);
-    
-    if (isDismiss) {
-        if (fromView) {
-            [transitionContext.containerView addSubview:fromView];
-        }
-    } else {
+    if (toView) {
         toViewController.view.alpha = 0;
         if (fromView) {
             [transitionContext.containerView addSubview:fromView];
@@ -137,26 +129,39 @@ - (void)performAnimationOnce {
 - (void)animateTransitions:(NSArray<id<DisplayLinkAnimatorDelegate>> *)animators
 	andTransitioningContext:(id<UIViewControllerContextTransitioning>)transitionContext {
     UIView *toView = [transitionContext viewForKey:UITransitionContextToViewKey];
+    UIViewController *fromVC = [transitionContext viewControllerForKey:UITransitionContextFromViewControllerKey];
+    
     BOOL isDismiss = (toView == nil);
 
-	DisplayLinkAnimator *displayLinkAnimator = [[DisplayLinkAnimator alloc]
-		initWithDisplayLinkAnimators:animators
-							duration:[self transitionDuration:transitionContext]];
-
-	[displayLinkAnimator setOnStart:^{
-	  UIViewController *toVC = [transitionContext viewControllerForKey:UITransitionContextToViewControllerKey];
+    if (isDismiss) {
+        [UIView animateWithDuration:[self transitionDuration:transitionContext]
+                         animations:^{
+            fromVC.view.alpha = 0;
+        } completion:^(BOOL finished) {
+            [transitionContext completeTransition:![transitionContext transitionWasCancelled]];
+            fromVC.view.alpha = 1;
+        }];
+        return;
+    }
+    
+    DisplayLinkAnimator *displayLinkAnimator = [[DisplayLinkAnimator alloc]
+                                                initWithDisplayLinkAnimators:animators
+                                                duration:[self transitionDuration:transitionContext]];
+    
+    [displayLinkAnimator setOnStart:^{
         if (!isDismiss) {
+            UIViewController *toVC = [transitionContext viewControllerForKey:UITransitionContextToViewControllerKey];
             toVC.view.alpha = 1.f;
         }
-	}];
-
-	[displayLinkAnimator setCompletion:^{
-	  if (![transitionContext transitionWasCancelled]) {
-		  [transitionContext completeTransition:![transitionContext transitionWasCancelled]];
-	  }
-	}];
-
-	[displayLinkAnimator start];
+    }];
+    
+    [displayLinkAnimator setCompletion:^{
+        if (![transitionContext transitionWasCancelled]) {
+            [transitionContext completeTransition:![transitionContext transitionWasCancelled]];
+        }
+    }];
+    
+    [displayLinkAnimator start];
 }
 
 - (NSTimeInterval)transitionDuration:(id<UIViewControllerContextTransitioning>)transitionContext {

ios/ScreenAnimationController.mm

@@ -26,9 +26,27 @@ - (instancetype)initWithEventEmitter:(RNNEventEmitter *)eventEmitter {
 - (void)navigationController:(UINavigationController *)navigationController
       willShowViewController:(UIViewController *)viewController
                     animated:(BOOL)animated {
-    if (_presentedViewController &&
-        ![navigationController.viewControllers containsObject:_presentedViewController]) {
-        _isPopping = YES;
+    if (_presentedViewController) {
+        if (![navigationController.viewControllers containsObject:_presentedViewController]) {
+            _isPopping = YES;
+        }
+        
+        id<UIViewControllerTransitionCoordinator> coordinator = navigationController.transitionCoordinator;
+        if (coordinator && coordinator.isInteractive) {
+            UIViewController *poppingViewController = _presentedViewController;
+            [coordinator notifyWhenInteractionChangesUsingBlock:^(id<UIViewControllerTransitionCoordinatorContext> context) {
+                if (!context.isCancelled) {
+                    if ([poppingViewController conformsToProtocol:@protocol(RNNLayoutProtocol)]) {
+                        UIViewController<RNNLayoutProtocol> *rnnVC = (UIViewController<RNNLayoutProtocol> *)poppingViewController;
+                        if ([rnnVC.options.navigationButtonEventOnSwipeBack withDefault:NO]) {
+                            NSString *buttonId = [rnnVC.options.topBar.backButton.identifier withDefault:@"RNN.back"];
+                            [self->_eventEmitter sendOnNavigationButtonPressed:rnnVC.layoutInfo.componentId
+                                                                      buttonId:buttonId];
+                        }
+                    }
+                }
+            }];
+        }
     }
 }
 

ios/StackControllerDelegate.mm

@@ -8,7 +8,6 @@ module.exports = {
   },
   roots: [
     '<rootDir>/src/',
-    '<rootDir>/Mock/',
     '<rootDir>/playground/src/',
     '<rootDir>/integration/',
     '<rootDir>/scripts/',
@@ -21,7 +20,7 @@ module.exports = {
     '^react-native$': '<rootDir>/node_modules/react-native',
     '^react-native-gesture-handler$': '<rootDir>/node_modules/react-native-gesture-handler',
     '^react-native-webview$': '<rootDir>/__mocks__/react-native-webview.js',
-    'react-native-navigation/Mock': '<rootDir>/Mock/index',
+    'react-native-navigation/Mock': '<rootDir>/src/Mock/index',
     'react-native-navigation': '<rootDir>/src',
     '^src$': '<rootDir>/src',
     '\\.(jpg|jpeg|png|gif|eot|otf|webp|svg|ttf|woff|woff2|mp4|webm|wav|mp3|m4a|aac|oga)$':

jest.config.js

@@ -20,14 +20,20 @@
     "rnn-link": "./autolink/postlink/run.js"
   },
   "main": "./lib/module/index.js",
-  "types": "./lib/typescript/src/index.d.ts",
+  "types": "./lib/typescript/index.d.ts",
   "react-native": "./src/index.ts",
   "exports": {
     ".": {
-      "react-native": "./src/index.ts",
+      "types": "./lib/typescript/index.d.ts",
+      "default": "./lib/module/index.js",
       "source": "./src/index.ts",
-      "types": "./lib/typescript/src/index.d.ts",
-      "default": "./lib/module/index.js"
+      "react-native": "./src/index.ts"
+    },
+    "./Mock": {
+      "types": "./lib/typescript/Mock/index.d.ts",
+      "default": "./lib/module/Mock/index.js",
+      "source": "./src/Mock/index.ts",
+      "react-native": "./src/Mock/index.ts"
     },
     "./package.json": "./package.json"
   },