Merge pull request #1989 from wikimedia/bug/location_3d_touch

Fix article location detail view peek/pop
wikimedia · Dec 15, 2017 · 6f2f583 · 6f2f583
2 parents 9aa68e2 + 7b98d7a
commit 6f2f583
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -30,7 +30,7 @@ GEM
     faraday_middleware (0.12.2)
       faraday (>= 0.7.4, < 1.0)
     fastimage (2.1.0)
-    fastlane (2.69.2)
+    fastlane (2.69.3)
       CFPropertyList (>= 2.3, < 3.0.0)
       addressable (>= 2.3, < 3.0.0)
       babosa (>= 1.0.2, < 2.0.0)

diff --git a/Wikipedia/Code/ArticleLocationCollectionViewController.swift b/Wikipedia/Code/ArticleLocationCollectionViewController.swift
@@ -122,9 +122,11 @@ extension ArticleLocationCollectionViewController {
 // MARK: - UIViewControllerPreviewingDelegate
 extension ArticleLocationCollectionViewController {
     override func previewingContext(_ previewingContext: UIViewControllerPreviewing, viewControllerForLocation location: CGPoint) -> UIViewController? {
-        guard let indexPath = collectionView.indexPathForItem(at: location) else {
+        guard let indexPath = collectionView.indexPathForItem(at: location),
+            let cell = collectionView.cellForItem(at: indexPath) else {
                 return nil
         }
+        previewingContext.sourceRect = cell.convert(cell.bounds, to: collectionView)
         let url = articleURL(at: indexPath)
         let articleViewController = WMFArticleViewController(articleURL: url, dataStore: dataStore, theme: self.theme)
         articleViewController.articlePreviewingActionsDelegate = self
@@ -133,6 +135,7 @@ extension ArticleLocationCollectionViewController {
     }
 
     override func previewingContext(_ previewingContext: UIViewControllerPreviewing, commit viewControllerToCommit: UIViewController) {
+        viewControllerToCommit.wmf_removePeekableChildViewControllers()
         wmf_push(viewControllerToCommit, animated: true)
     }
 }