fixup scrolling

kazuhiro4949 · Jul 17, 2017 · e7e6f8e · e7e6f8e
1 parent 527a239
commit e7e6f8e
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 18 deletions.
diff --git a/PagingKit/MenuView.swift b/PagingKit/MenuView.swift
@@ -133,7 +133,12 @@ public class PagingMenuView: UIScrollView {
     }
 
     public func rectForItem(at index: Int) -> CGRect? {
-        guard index < frameQueue.count else { return nil }
+        guard index < frameQueue.count else {
+            let lastFrame = frameQueue.last
+            let rightEdge = lastFrame.flatMap { CGRect(x: $0.maxX, y: 0, width: 0, height: 0) }
+            return rightEdge
+        }
+
         let x = (0..<index).reduce(0) { (sum, idx) in
             return sum + frameQueue[idx].width
         }

diff --git a/PagingKit/PagingContentViewController.swift b/PagingKit/PagingContentViewController.swift
@@ -54,12 +54,13 @@ public class PagingContentViewController: UIViewController {
     public func scroll(to page: Int, animated: Bool) {
         let offsetX = scrollView.bounds.width * CGFloat(page)
         loadPagesIfNeeded(page: page)
-        UIView.perform(.delete, on: [], options: UIViewAnimationOptions(rawValue: 0),
-            animations: { [weak self] in
+        if animated {
+            performSystemAnimation({ [weak self] in
                 self?.scrollView.contentOffset = CGPoint(x: offsetX, y: 0)
-            },
-            completion: { _ in }
-        )
+            })
+        } else {
+            scrollView.contentOffset = CGPoint(x: offsetX, y: 0)
+        }
     }
 
     fileprivate var numberOfPages: Int = 0
@@ -209,3 +210,13 @@ extension PagingContentViewController: UIScrollViewDelegate {
         loadScrollView(with: loadingPage + 1)
     }
 }
+
+private func performSystemAnimation(_ animations: @escaping () -> Void, completion: ((Bool) -> Void)? = nil) {
+    UIView.perform(
+        .delete,
+        on: [],
+        options: UIViewAnimationOptions(rawValue: 0),
+        animations: animations,
+        completion: completion
+    )
+}
diff --git a/PagingKit/PagingMenuViewController.swift b/PagingKit/PagingMenuViewController.swift
@@ -56,8 +56,8 @@ public class PagingMenuViewController: UIViewController {
 
     public func scroll(index: Int, percent: CGFloat = 0, animated: Bool = true) {
         let rightIndex = index + 1
-        guard rightIndex < menuView.numberOfItem,
-            let leftFrame = menuView.rectForItem(at: index),
+
+        guard let leftFrame = menuView.rectForItem(at: index),
             let rightFrame = menuView.rectForItem(at: rightIndex) else { return }
 
         let width = (rightFrame.width - leftFrame.width) * percent + leftFrame.width

diff --git a/iOS Sample/iOS Sample/MenuCell.swift b/iOS Sample/iOS Sample/MenuCell.swift
@@ -10,8 +10,6 @@ import UIKit
 import PagingKit
 
 class MenuCell: PagingMenuCell {
-
-    static let sizingCell = UINib(nibName: "MenuCell", bundle: nil).instantiate(withOwner: self, options: nil).first as! MenuCell
 
     @IBOutlet weak var titleLabel: UILabel!
     override func awakeFromNib() {

diff --git a/iOS Sample/iOS Sample/ViewController.swift b/iOS Sample/iOS Sample/ViewController.swift
@@ -15,7 +15,7 @@ class ViewController: UIViewController {
     var contentViewController: PagingContentViewController?
 
 
-    let dataSource: [(menu: String, content: UIViewController)] = ["Martinez", "Alfred", "Louis", "Justin", "Tim", "Deborah", "Michael", "Choi", "Hamilton", "Decker", "Johnson", "George"].map {
+    let dataSource: [(menu: String, content: UIViewController)] = ["Martinez", "Alfred", "Louis", "Justin"].map {
         let title = $0
         let vc = UIStoryboard(name: "Main", bundle: nil).instantiateViewController(withIdentifier: "ContentViewController") as! ContentViewController
         vc.number = title
@@ -27,8 +27,8 @@ class ViewController: UIViewController {
 
         menuViewController?.register(nib: UINib(nibName: "MenuCell", bundle: nil), forCellWithReuseIdentifier: "identifier")
         menuViewController?.registerFocusView(nib: UINib(nibName: "FocusView", bundle: nil))
-        menuViewController?.reloadDate(startingOn: 0)
-        contentViewController?.reloadData(with: 0)
+        menuViewController?.reloadDate(startingOn: 2)
+        contentViewController?.reloadData(with: 2)
     }
 
     override func didReceiveMemoryWarning() {
@@ -60,11 +60,7 @@ extension ViewController: PagingMenuViewControllerDataSource {
     }
 
     func menuViewController(viewController: PagingMenuViewController, areaForItemAt index: Int) -> CGFloat {
-        MenuCell.sizingCell.titleLabel.text = dataSource[index].menu
-        var referenceSize = UILayoutFittingCompressedSize
-        referenceSize.height = viewController.view.bounds.height
-        let size = MenuCell.sizingCell.systemLayoutSizeFitting(referenceSize)
-        return size.width
+        return viewController.view.bounds.size.width / CGFloat(dataSource.count)
     }