From 52ae8dd4dc7aa021a39b1b0fccc28eb35c06af63 Mon Sep 17 00:00:00 2001
From: aron1127 <aron1127@naver.com>
Date: Fri, 20 Sep 2019 11:43:30 +0900
Subject: [PATCH] Error : Fix limited scrolling range when dragging

---
 .DS_Store                               | Bin 0 -> 6148 bytes
 JZCalendarWeekView/JZBaseWeekView.swift |  48 +++++++++++++++++++++---
 2 files changed, 42 insertions(+), 6 deletions(-)
 create mode 100644 .DS_Store

diff --git a/.DS_Store b/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..72bceadd5b3b1b4cce45b0d78018fd6642fe5b93
GIT binary patch
literal 6148
zcmeHK-D(p-6h4!tW|Ja@B2>kTy%D?!rKzp86d|U`MMOp1(t<y<yV=F8Zg<1(#;wLk
zZhQyPC-7B#0UyK%&~JV$*-eFBiO3w7`OeIo?`-DF?92`kvG&Mq64i;wK;c-fp*q9(
zI4^TnQazl<M2;Z^<n@B6?*wzvx<f0V75LW_;O}mQx^zM|9n;MF8#x%^+rkdY&7Z>H
z%|$y|GIRnF{mmH$ev+=OeP^YG^5TVxVbqM;#o7yN5M@?sr=z58$Ip1{v7HVa<?lsN
zaO&I6zVBs+^~<|anA(2m#e(d+9zvcU_@NtR?PwIbiO6Hg0mG;o)x-ML@pye}YolRq
zZZ{_lb9`rgvte%Bx;>dxjg=eCyS=01x9`U9Cm%kGnGnOSCG3*I-|z)aL6tXF90pPN
z5+j_oO!w(2?Lsx|codQgFQx<d9=)c0@`0J$2~U;$3f`=e*UpoJR`IVy$e#c`>gRK^
zl|s(z=gfIReUa5e))?NaLf(&sycK#tJ<PXDkI15KA^Jxlx=K$Fd5=2u5V(q!<>nbB
zyTDjN);@j-*Du6e2l!1XC3%)ui=SrJ;v(%KJ~<<jYdsr@rnZ6tYV{jSg?`=C3TOqi
z0(^fkQ8=~~P9=)11C_V}0L$nW2A_X4aE__4rEn?{BQPeZKuKllioqlu{icd*DV$1_
zbYklA!PJwPx}h-fbmTWhII)&QU26rj0(k`%WV6oC|L&jf|9O&bX$7<b|CIu)+_5@s
zOi7)sbCcs|t%-7k!i~pGB?<~EbsP(aAH`Qtgkj9&4zQ(gDiJ*}{UIP^(3Mu;uPX2h
DN0ZEM

literal 0
HcmV?d00001

diff --git a/JZCalendarWeekView/JZBaseWeekView.swift b/JZCalendarWeekView/JZBaseWeekView.swift
index a852e8c..0c4cdae 100644
--- a/JZCalendarWeekView/JZBaseWeekView.swift
+++ b/JZCalendarWeekView/JZBaseWeekView.swift
@@ -521,19 +521,25 @@ extension JZBaseWeekView: UICollectionViewDelegate, UICollectionViewDelegateFlow
 
     open func scrollViewDidEndDragging(_ scrollView: UIScrollView, willDecelerate decelerate: Bool) {
         // handle the situation scrollViewDidEndDecelerating not being called
-        if !decelerate { self.endOfScroll() }
+        if !decelerate {
+            self.endOfScroll()
+            self.scrollDirection = nil
+        }
     }
 
     // This function will be called when veritical scrolling ends
     open func scrollViewDidEndDecelerating(_ scrollView: UIScrollView) {
         self.endOfScroll()
+        
+        if checkDragRangesInHorizontalScroll() {
+            self.scrollDirection = nil
+        }
     }
 
     /// Some actions need to be done when scroll ends
     private func endOfScroll() {
         // vertical scroll should not load page, handled in loadPage method
         loadPage()
-        self.scrollDirection = nil
     }
 
     open func scrollViewDidScroll(_ scrollView: UIScrollView) {
@@ -586,10 +592,12 @@ extension JZBaseWeekView: UICollectionViewDelegate, UICollectionViewDelegateFlow
 
     // sectionScroll load page
     private func loadPageSectionScroll() {
-        let currentDate = getDateForContentOffsetX(collectionView.contentOffset.x)
-        let currentInitDate = currentDate.add(component: .day, value: -numOfDays)
-        self.initDate = currentInitDate
-        self.forceReload()
+        if checkDragRangesInHorizontalScroll() {
+            let currentDate = getDateForContentOffsetX(collectionView.contentOffset.x)
+            let currentInitDate = currentDate.add(component: .day, value: -numOfDays)
+            self.initDate = currentInitDate
+            self.forceReload()
+        }
     }
 
     /// pageScroll loading next page or previous page (Only three pages (3*numOfDays) exist at the same time)
@@ -635,6 +643,28 @@ extension JZBaseWeekView {
         return timeline
     }
 
+    // If you drag again before the drag is complete,
+    // Ensure that it does not fall outside the set range.
+    func checkDragRangesInHorizontalScroll() -> Bool {
+        guard let scrollDirection = self.scrollDirection, scrollDirection.direction == .horizontal else { return true }
+        let currentStartDate = getDateForContentOffsetX(collectionView.contentOffset.x) // Left-hand date of the screen you are viewing
+        let currentEndDate = getDateForContentOffsetX(collectionView.contentOffset.x + contentViewWidth - 1) // The right-hand date of the screen you are viewing
+        
+        // Initialize if within the set range left scroll.
+        if let startDate = self.scrollableRange.startDate {
+            if startDate.totalDistance(from: currentStartDate, resultIn: .day)! < 0 {
+                return false
+            }
+        }
+        // Initialize if within the set range right scroll.
+        if let endDate = self.scrollableRange.endDate {
+            if endDate.totalDistance(from: currentEndDate, resultIn: .day)! > 0 {
+                return false
+            }
+        }
+        // return OK set next Range
+        return true
+    }
 }
 
 // MARK: - Horizontal scrollable range methods
@@ -735,3 +765,9 @@ extension JZBaseWeekView: WeekViewFlowLayoutDelegate {
         return JZSupplementaryViewKinds.eventCell
     }
 }
+
+extension Date { // Date Comparison
+    func totalDistance(from date: Date, resultIn component: Calendar.Component) -> Int? {
+        return Calendar.current.dateComponents([component], from: self, to: date).value(for: component)
+    }
+}