From a7ec1cef38dcfe6ed9d5efdbb8bb6dce9c33ad24 Mon Sep 17 00:00:00 2001
From: kahayash <kahayash@MBP15UAQ-A022.local>
Date: Tue, 18 Jul 2017 20:45:17 +0900
Subject: [PATCH] fixup

---
 PagingKit/MenuView.swift                    | 29 ++++++++++++++-------
 PagingKit/PagingContentViewController.swift |  6 ++---
 PagingKit/PagingMenuViewController.swift    |  1 +
 iOS Sample/iOS Sample/ViewController.swift  |  5 ----
 4 files changed, 22 insertions(+), 19 deletions(-)

diff --git a/PagingKit/MenuView.swift b/PagingKit/MenuView.swift
index df7237b..3d6ac25 100644
--- a/PagingKit/MenuView.swift
+++ b/PagingKit/MenuView.swift
@@ -159,21 +159,13 @@ public class PagingMenuView: UIScrollView {
         guard let dataSource = dataSource else {
             return
         }
-        
+
         visibleCells.forEach { $0.removeFromSuperview() }
         visibleCells = []
         
         numberOfItem = dataSource.numberOfItemForPagingMenuView()
         
-        frameQueue = []
-        var containerWidth: CGFloat = 0
-        (0..<numberOfItem).forEach { (index) in
-            let width = dataSource.pagingMenuView(pagingMenuView: self, widthForItemAt: index)
-            frameQueue.append(CGRect(x: containerWidth, y: 0, width: width, height: bounds.height))
-            containerWidth += width
-        }
-        contentSize = CGSize(width: containerWidth, height: bounds.height)
-        containerView.frame = CGRect(origin: .zero, size: contentSize)
+        invalidateLayout()
         
         setNeedsLayout()
         layoutIfNeeded()
@@ -229,6 +221,23 @@ public class PagingMenuView: UIScrollView {
         return CGRect(x: x, y: 0, width: frameQueue[index].width, height: bounds.height)
     }
     
+    public func invalidateLayout() {
+        guard let dataSource = dataSource else {
+            return
+        }
+
+        frameQueue = []
+        var containerWidth: CGFloat = 0
+        (0..<numberOfItem).forEach { (index) in
+            let width = dataSource.pagingMenuView(pagingMenuView: self, widthForItemAt: index)
+            frameQueue.append(CGRect(x: containerWidth, y: 0, width: width, height: bounds.height))
+            containerWidth += width
+        }
+        contentSize = CGSize(width: containerWidth, height: bounds.height)
+        containerView.frame = CGRect(origin: .zero, size: contentSize)
+        align()
+    }
+    
     private func recenterIfNeeded() {
         let currentOffset = contentOffset
         let contentWidth = contentSize.width
diff --git a/PagingKit/PagingContentViewController.swift b/PagingKit/PagingContentViewController.swift
index 62a0ae5..13d2547 100644
--- a/PagingKit/PagingContentViewController.swift
+++ b/PagingKit/PagingContentViewController.swift
@@ -49,6 +49,7 @@ public class PagingContentViewController: UIViewController {
     public func reloadData(with page: Int = 0) {
         initialLoad(with: page)
         scroll(to: page, animated: false)
+        leftSidePageIndex = page
     }
     
     public func scroll(to page: Int, animated: Bool) {
@@ -65,7 +66,6 @@ public class PagingContentViewController: UIViewController {
     
     fileprivate var numberOfPages: Int = 0
     
-    fileprivate var lastContentOffset = CGPoint.zero
     fileprivate var leftSidePageIndex = 0
     fileprivate var isExplicityScrolling = false
     
@@ -157,10 +157,8 @@ extension PagingContentViewController: UIScrollViewDelegate {
     }
     
     public func scrollViewDidScroll(_ scrollView: UIScrollView) {
-        lastContentOffset = scrollView.contentOffset
-        leftSidePageIndex = Int(scrollView.contentOffset.x / scrollView.bounds.width)
-        
         if isExplicityScrolling {
+            leftSidePageIndex = Int(scrollView.contentOffset.x / scrollView.bounds.width)
             let leftSideContentOffset = CGFloat(leftSidePageIndex) * scrollView.bounds.width
             let percent = (scrollView.contentOffset.x - leftSideContentOffset) / scrollView.bounds.width
             let normalizedPercent = min(max(0, percent), 1)
diff --git a/PagingKit/PagingMenuViewController.swift b/PagingKit/PagingMenuViewController.swift
index 0c98988..09d475c 100644
--- a/PagingKit/PagingMenuViewController.swift
+++ b/PagingKit/PagingMenuViewController.swift
@@ -174,6 +174,7 @@ public class PagingMenuViewController: UIViewController {
         
         let index = menuView.indexForItem(at: focusView.center)
         layoutHandler = { [weak self] in
+            self?.menuView.invalidateLayout()
             self?.scroll(index: index ?? 0, percent: 0, animated: false)
             self?.layoutHandler = nil
         }
diff --git a/iOS Sample/iOS Sample/ViewController.swift b/iOS Sample/iOS Sample/ViewController.swift
index b813d1f..40296c2 100644
--- a/iOS Sample/iOS Sample/ViewController.swift	
+++ b/iOS Sample/iOS Sample/ViewController.swift	
@@ -30,11 +30,6 @@ class ViewController: UIViewController {
         menuViewController?.reloadData(startingOn: dataSource.count - 1)
         contentViewController?.reloadData(with: dataSource.count - 1)
     }
-    
-    override func viewDidLayoutSubviews() {
-        super.viewDidLayoutSubviews()
-        menuViewController?.reloadData()
-    }
 
     override func didReceiveMemoryWarning() {
         super.didReceiveMemoryWarning()