Merge pull request #8 from istyle-inc/feature-refresh-data-bug

Fixed a bug that data was deleted during reloadData
istyle-inc · Feb 12, 2020 · f479149 · f479149
2 parents 8327e62 + ff76f1b
commit f479149
Show file tree

Hide file tree

Showing 7 changed files with 30 additions and 10 deletions.
diff --git a/Example/LoadMoreTableViewController/ViewController.swift b/Example/LoadMoreTableViewController/ViewController.swift
@@ -78,12 +78,12 @@ class ViewController: LoadMoreTableViewController {
 
     @objc func clear() {
         count = 0
-        refreshData(immediately: true)
+        safeRefreshData(immediately: true)
     }
 
     @objc func refresh() {
         count = 0
-        refreshData(immediately: false)
+        safeRefreshData(immediately: false)
     }
 
 }
diff --git a/Example/Podfile.lock b/Example/Podfile.lock
@@ -1,5 +1,5 @@
 PODS:
-  - LoadMoreTableViewController (2.1.0)
+  - LoadMoreTableViewController (2.1.2)
 
 DEPENDENCIES:
   - LoadMoreTableViewController (from `../`)
@@ -9,7 +9,7 @@ EXTERNAL SOURCES:
     :path: "../"
 
 SPEC CHECKSUMS:
-  LoadMoreTableViewController: 94c685dd5ecf38bc2bc9190bd4bf0b9671ffc623
+  LoadMoreTableViewController: 6a7059a50d4544bf23d011172a15740aab361fe3
 
 PODFILE CHECKSUM: 2d1c41854f8e04f260b3d9549af07292e79adc0b
 

diff --git a/Example/Pods/Local Podspecs/LoadMoreTableViewController.podspec.json b/Example/Pods/Local Podspecs/LoadMoreTableViewController.podspec.json
diff --git a/Example/Pods/Manifest.lock b/Example/Pods/Manifest.lock
diff --git a/...s/Target Support Files/LoadMoreTableViewController/LoadMoreTableViewController-Info.plist b/...s/Target Support Files/LoadMoreTableViewController/LoadMoreTableViewController-Info.plist
diff --git a/LoadMoreTableViewController.podspec b/LoadMoreTableViewController.podspec
@@ -8,7 +8,7 @@
 
 Pod::Spec.new do |s|
   s.name             = "LoadMoreTableViewController"
-  s.version          = "2.1.0"
+  s.version          = "2.1.2"
   s.summary          = "Automatic cell loading on UITableViewController."
 
 # This description is used to generate tags and improve search results.

diff --git a/Pod/Classes/LoadMoreTableViewController.swift b/Pod/Classes/LoadMoreTableViewController.swift
@@ -155,6 +155,7 @@ open class LoadMoreTableViewController: UITableViewController {
     ///     - immediately:
     ///         - true: It will show an activity indicator on the top then fetch the data.
     ///         - false: It will refresh the table view after fetching the data.
+    @available(*, deprecated, renamed: "safeRefreshData")
     open func refreshData(immediately: Bool) {
         sourceObjects.removeAll()
         showsRetryButton = false
@@ -174,6 +175,25 @@ open class LoadMoreTableViewController: UITableViewController {
         }
     }
 
+    open func safeRefreshData(immediately: Bool) {
+        DispatchQueue.main.async {
+            self.sourceObjects.removeAll()
+            self.showsRetryButton = false
+
+            // To refresh the table view when it is scrolling
+            if immediately {
+                self.isScrolling = false
+            }
+
+            if immediately {
+                self.tableView.reloadData()
+                self.updateFooter(show: true)
+            } else {
+                self.loadMore(reload: true)
+            }
+        }
+    }
+
     public func showRetryButton() {
         isRequesting = false
         showsRetryButton = true