Merge pull request #287 from nytimes/develop

Merge develop into master
nytimes · Dec 5, 2019 · 708d13f · 708d13f
2 parents d9cf272 + 0d98e88
commit 708d13f
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,9 +2,19 @@
 
 Changes for users of the library currently on `develop`:
 
-- Fixed some tests, added tests for NYTPhotoViewerSinglePhotoDataSource
-- Fixed a strict warning and a subscripting bug in NYTPhotoViewerArrayDataSource.m
-- Added support for interstitial views
+## [3.0.1](https://github.com/nytimes/NYTPhotoViewer/releases/tag/3.0.1)
+
+Changes for users of the library in 3.0.1:
+
+- Fixed issue with beginAppearanceTransition being called on VCs with no parent VC
+
+## [3.0.0](https://github.com/nytimes/NYTPhotoViewer/releases/tag/3.0.0)
+
+Changes for users of the library in 3.0.0:
+
+- Unit test improvements
+- Interstitial view support + Swift sample
+- NSObject conformance for example app
 
 ## [2.0.0](https://github.com/NYTimes/NYTPhotoViewer/releases/tag/2.0.0)
 

diff --git a/NYTPhotoViewer.podspec b/NYTPhotoViewer.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = "NYTPhotoViewer"
-  s.version          = "3.0.0"
+  s.version          = "3.0.1"
 
   s.description      = <<-DESC
                        NYTPhotoViewer is a slideshow and image viewer that includes double tap to zoom, captions, support for multiple images, interactive flick to dismiss, animated zooming presentation, and more.

diff --git a/NYTPhotoViewer/NYTPhotoTransitionAnimator.m b/NYTPhotoViewer/NYTPhotoTransitionAnimator.m
@@ -52,9 +52,15 @@ - (void)setupTransitionContainerHierarchyWithTransitionContext:(id <UIViewContro
     self.fromViewController = [transitionContext viewControllerForKey:UITransitionContextFromViewControllerKey];
 
     toView.frame = [transitionContext finalFrameForViewController:self.toViewController];
-    [self.toViewController beginAppearanceTransition:YES animated:YES];
-    [self.fromViewController beginAppearanceTransition:NO animated:YES];
-
+
+    if (self.toViewController.parentViewController) {
+        [self.toViewController beginAppearanceTransition:YES animated:YES];
+    }
+
+    if (self.fromViewController.parentViewController) {
+        [self.fromViewController beginAppearanceTransition:NO animated:YES];
+    }
+
     if (![toView isDescendantOfView:transitionContext.containerView]) {
         [transitionContext.containerView addSubview:toView];
     }