Merge pull request #7 from quipper/fix_reload

avoid unneeded offset update
quipper · Sep 17, 2019 · 2c7ebe2 · 2c7ebe2
2 parents ca81444 + 49d70ac
commit 2c7ebe2
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/Example/Sources/View Controllers/AnnouncementExampleViewController.swift b/Example/Sources/View Controllers/AnnouncementExampleViewController.swift
@@ -31,6 +31,12 @@ class AnnouncementExampleViewController: MessagesViewController {
         conversationMessages = ConversationMessageMockFactory.getConversations()
     }
 
+    override func viewDidAppear(_ animated: Bool) {
+        super.viewDidAppear(animated)
+
+        messagesCollectionView.reloadDataAndKeepOffset()
+    }
+
     func configureMessageCollectionView() {
 
         if let layout = messagesCollectionView.collectionViewLayout as? MessagesCollectionViewFlowLayout {

diff --git a/Sources/Views/MessagesCollectionView.swift b/Sources/Views/MessagesCollectionView.swift
@@ -126,6 +126,10 @@ open class MessagesCollectionView: UICollectionView {
         let newOffset = CGPoint(
             x: contentOffset.x + (afterContentSize.width - beforeContentSize.width),
             y: contentOffset.y + (afterContentSize.height - beforeContentSize.height))
+        // if offset.y is smaller than contentSize, no need to update contentOffset
+        guard newOffset.y >= contentSize.height else {
+            return
+        }
         setContentOffset(newOffset, animated: false)
     }