Fix pageIncrement in infinite pager

fermoya · Apr 8, 2022 · 43b291c · 43b291c
1 parent 974a75b
commit 43b291c
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 37 deletions.
diff --git a/Sources/SwiftUIPager/PagerContent+Helper.swift b/Sources/SwiftUIPager/PagerContent+Helper.swift
@@ -288,12 +288,12 @@ extension Pager.PagerContent {
     }
 
     /// Returns true if the item is the first or last element in memory. Just used when `isInfinitePager` is set to `true` to hide elements being resorted.
-//    func isEdgePage(_ item: PageWrapper<Element, ID>) -> Bool {
-//        guard data.count >= 3 else { return false }
-//        guard !isDragging else { return false }
-//        guard let index = dataDisplayed.firstIndex(of: item) else { return false }
-//        let limit = max(pageIncrement, 1)
-//        return index < limit || index > dataDisplayed.count - 1 - limit
-//    }
+    func isEdgePage(_ item: PageWrapper<Element, ID>) -> Bool {
+        guard data.count >= 3 else { return false }
+        guard !isDragging else { return false }
+        guard let index = dataDisplayed.firstIndex(of: item) else { return false }
+        let limit = max(pageIncrement, 1)
+        return index < limit || index > dataDisplayed.count - 1 - limit
+    }
 
 }
diff --git a/Sources/SwiftUIPager/PagerContent.swift b/Sources/SwiftUIPager/PagerContent.swift
@@ -178,21 +178,20 @@ extension Pager {
         var body: some View {
             let stack = HStack(spacing: interactiveItemSpacing) {
                 ForEach(dataDisplayed, id: id) { item in
-//                    Group {
-//                        if self.isInifinitePager && self.isEdgePage(item) {
-//                            EmptyView()
-//                        } else {
-//                            self.content(item.element)
-//                        }
-//                    }
-                    self.content(item.element)
-                        .frame(size: self.pageSize)
-                        .scaleEffect(self.scale(for: item))
-                        .rotation3DEffect((self.isHorizontal ? .zero : Angle(degrees: -90)) - self.scrollDirectionAngle,
-                                          axis: (0, 0, 1))
-                        .rotation3DEffect(self.angle(for: item),
-                                          axis:  self.axis)
-                        .opacity(opacity(for: item))
+                    Group {
+                        if self.isInifinitePager && self.isEdgePage(item) {
+                            EmptyView()
+                        } else {
+                            self.content(item.element)
+                                .frame(size: self.pageSize)
+                                .scaleEffect(self.scale(for: item))
+                                .rotation3DEffect((self.isHorizontal ? .zero : Angle(degrees: -90)) - self.scrollDirectionAngle,
+                                                  axis: (0, 0, 1))
+                                .rotation3DEffect(self.angle(for: item),
+                                                  axis:  self.axis)
+                                .opacity(opacity(for: item))
+                        }
+                    }
                 }
                 .offset(x: self.xOffset, y : self.yOffset)
             }
@@ -393,8 +392,7 @@ extension Pager.PagerContent {
         }
         withAnimation(animation) {
             self.pagerModel.draggingOffset = 0
-            let sign = page > newPage ? -1 : +1
-            self.pagerModel.pageIncrement += sign * pageIncrement
+            self.pagerModel.pageIncrement = pageIncrement
             self.pagerModel.draggingVelocity = 0
             self.pagerModel.lastDraggingValue = nil
             self.pagerModel.index = newPage

diff --git a/Tests/SwiftUIPagerTests/PagerContent+Helper_Tests.swift b/Tests/SwiftUIPagerTests/PagerContent+Helper_Tests.swift
@@ -338,21 +338,22 @@ final class PagerContent_Helper_Tests: XCTestCase {
         XCTAssertLessThan(angle.degrees, .zero)
     }
 
-//    func test_GivenPagerDragging_WhenIsEdgePage_ThenFalse() {
-//        let pager = givenPager.pageOffset(0.1)
-//        let isEdgePage = pager.isEdgePage(.init(batchId: 1, keyPath: \.self, element: 0))
-//        XCTAssertFalse(isEdgePage)
-//    }
-//
-//    func test_GivenPager_WhenIsEdgePage_ThenTrue() {
-//        let pager = givenPager.loopPages()
-//        XCTAssertTrue(pager.isEdgePage(.init(batchId: 1, keyPath: \.self, element: 18)))
-//        XCTAssertTrue(pager.isEdgePage(.init(batchId: 1, keyPath: \.self, element: 2)))
-//        XCTAssertFalse(pager.isEdgePage(.init(batchId: 1, keyPath: \.self, element: 1)))
-//    }
+    func test_GivenPagerDragging_WhenIsEdgePage_ThenFalse() {
+        let pager = givenPager.pageOffset(0.1)
+        let isEdgePage = pager.isEdgePage(.init(batchId: 1, keyPath: \.self, element: 0))
+        XCTAssertFalse(isEdgePage)
+    }
+
+    func test_GivenPager_WhenIsEdgePage_ThenTrue() {
+        let pager = givenPager.loopPages()
+        XCTAssertTrue(pager.isEdgePage(.init(batchId: 1, keyPath: \.self, element: 18)))
+        XCTAssertTrue(pager.isEdgePage(.init(batchId: 1, keyPath: \.self, element: 2)))
+        XCTAssertFalse(pager.isEdgePage(.init(batchId: 1, keyPath: \.self, element: 1)))
+    }
 
     static var allTests = [
-//        ("test_GivenPagerDragging_WhenIsEdgePage_ThenFalse", test_GivenPagerDragging_WhenIsEdgePage_ThenFalse),
+        ("test_GivenPager_WhenIsEdgePage_ThenTrue", test_GivenPager_WhenIsEdgePage_ThenTrue),
+        ("test_GivenPagerDragging_WhenIsEdgePage_ThenFalse", test_GivenPagerDragging_WhenIsEdgePage_ThenFalse),
         ("test_GivenPagerWithRotation3DDraggingForward_WhenAngle_ThenGreaterThanZero", test_GivenPagerWithRotation3DDraggingForward_WhenAngle_ThenGreaterThanZero),
         ("test_GivenPagerWithRotation3DDraggingBackward_WhenAngle_ThenLessThanZero", test_GivenPagerWithRotation3DDraggingBackward_WhenAngle_ThenLessThanZero),
         ("test_GivenPager_WhenAngle_ThenZero", test_GivenPager_WhenAngle_ThenZero),