Merge pull request #26 from Isvvc/master

Jake-Short · web-flow · commit 87a7a1d609f5 · 2021-03-31T11:50:36.000-07:00
Fix laggy dragging
diff --git a/Sources/ImageViewer/ImageViewer.swift b/Sources/ImageViewer/ImageViewer.swift
@@ -84,11 +84,16 @@ public struct ImageViewer: View {
                                 }
                                 .onEnded { value in
                                     if((abs(self.dragOffset.height) + abs(self.dragOffset.width) > 570) || ((abs(self.dragOffsetPredicted.height)) / (abs(self.dragOffset.height)) > 3) || ((abs(self.dragOffsetPredicted.width)) / (abs(self.dragOffset.width))) > 3) {
+                                        withAnimation(.spring()) {
+                                            self.dragOffset = self.dragOffsetPredicted
+                                        }
                                         self.viewerShown = false
                                         
                                         return
                                     }
-                                    self.dragOffset = .zero
+                                    withAnimation(.interactiveSpring()) {
+                                        self.dragOffset = .zero
+                                    }
                                 }
                             )
                             
@@ -273,7 +278,6 @@ struct PinchToZoom: ViewModifier {
         content
             .scaleEffect(scale, anchor: anchor)
             .offset(offset)
-            .animation(isPinching ? .none : .spring())
             .overlay(PinchZoom(scale: $scale, anchor: $anchor, offset: $offset, isPinching: $isPinching))
     }
 }
diff --git a/Sources/ImageViewerRemote/ImageViewerRemote.swift b/Sources/ImageViewerRemote/ImageViewerRemote.swift
@@ -76,10 +76,15 @@ public struct ImageViewerRemote: View {
                                         }
                                         .onEnded { value in
                                             if((abs(self.dragOffset.height) + abs(self.dragOffset.width) > 570) || ((abs(self.dragOffsetPredicted.height)) / (abs(self.dragOffset.height)) > 3) || ((abs(self.dragOffsetPredicted.width)) / (abs(self.dragOffset.width))) > 3) {
+                                                withAnimation(.spring()) {
+                                                    self.dragOffset = self.dragOffsetPredicted
+                                                }
                                                 self.viewerShown = false
                                                 return
                                             }
-                                            self.dragOffset = .zero
+                                            withAnimation(.interactiveSpring()) {
+                                                self.dragOffset = .zero
+                                            }
                                         }
                                     )
                                 })
@@ -99,10 +104,15 @@ public struct ImageViewerRemote: View {
                                             }
                                             .onEnded { value in
                                                 if((abs(self.dragOffset.height) + abs(self.dragOffset.width) > 570) || ((abs(self.dragOffsetPredicted.height)) / (abs(self.dragOffset.height)) > 3) || ((abs(self.dragOffsetPredicted.width)) / (abs(self.dragOffset.width))) > 3) {
+                                                    withAnimation(.spring()) {
+                                                        self.dragOffset = self.dragOffsetPredicted
+                                                    }
                                                     self.viewerShown = false
                                                     return
                                                 }
-                                                self.dragOffset = .zero
+                                                withAnimation(.interactiveSpring()) {
+                                                    self.dragOffset = .zero
+                                                }
                                             }
                                         )
                                 }
@@ -291,7 +301,6 @@ struct PinchToZoom: ViewModifier {
         content
             .scaleEffect(scale, anchor: anchor)
             .offset(offset)
-            .animation(isPinching ? .none : .spring())
             .overlay(PinchZoom(scale: $scale, anchor: $anchor, offset: $offset, isPinching: $isPinching))
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -84,11 +84,16 @@ public struct ImageViewer: View {`
`84`	`84`	`}`
`85`	`85`	`.onEnded { value in`
`86`	`86`	`if((abs(self.dragOffset.height) + abs(self.dragOffset.width) > 570) \|\| ((abs(self.dragOffsetPredicted.height)) / (abs(self.dragOffset.height)) > 3) \|\| ((abs(self.dragOffsetPredicted.width)) / (abs(self.dragOffset.width))) > 3) {`
	`87`	`+ withAnimation(.spring()) {`
	`88`	`+ self.dragOffset = self.dragOffsetPredicted`
	`89`	`+ }`
`87`	`90`	`self.viewerShown = false`
`88`	`91`
`89`	`92`	`return`
`90`	`93`	`}`
`91`		`- self.dragOffset = .zero`
	`94`	`+ withAnimation(.interactiveSpring()) {`
	`95`	`+ self.dragOffset = .zero`
	`96`	`+ }`
`92`	`97`	`}`
`93`	`98`	`)`
`94`	`99`
`@@ -273,7 +278,6 @@ struct PinchToZoom: ViewModifier {`
`273`	`278`	`content`
`274`	`279`	`.scaleEffect(scale, anchor: anchor)`
`275`	`280`	`.offset(offset)`
`276`		`- .animation(isPinching ? .none : .spring())`
`277`	`281`	`.overlay(PinchZoom(scale: $scale, anchor: $anchor, offset: $offset, isPinching: $isPinching))`
`278`	`282`	`}`
`279`	`283`	`}`
Original file line number	Diff line number	Diff line change
`@@ -76,10 +76,15 @@ public struct ImageViewerRemote: View {`
`76`	`76`	`}`
`77`	`77`	`.onEnded { value in`
`78`	`78`	`if((abs(self.dragOffset.height) + abs(self.dragOffset.width) > 570) \|\| ((abs(self.dragOffsetPredicted.height)) / (abs(self.dragOffset.height)) > 3) \|\| ((abs(self.dragOffsetPredicted.width)) / (abs(self.dragOffset.width))) > 3) {`
	`79`	`+ withAnimation(.spring()) {`
	`80`	`+ self.dragOffset = self.dragOffsetPredicted`
	`81`	`+ }`
`79`	`82`	`self.viewerShown = false`
`80`	`83`	`return`
`81`	`84`	`}`
`82`		`- self.dragOffset = .zero`
	`85`	`+ withAnimation(.interactiveSpring()) {`
	`86`	`+ self.dragOffset = .zero`
	`87`	`+ }`
`83`	`88`	`}`
`84`	`89`	`)`
`85`	`90`	`})`
`@@ -99,10 +104,15 @@ public struct ImageViewerRemote: View {`
`99`	`104`	`}`
`100`	`105`	`.onEnded { value in`
`101`	`106`	`if((abs(self.dragOffset.height) + abs(self.dragOffset.width) > 570) \|\| ((abs(self.dragOffsetPredicted.height)) / (abs(self.dragOffset.height)) > 3) \|\| ((abs(self.dragOffsetPredicted.width)) / (abs(self.dragOffset.width))) > 3) {`
	`107`	`+ withAnimation(.spring()) {`
	`108`	`+ self.dragOffset = self.dragOffsetPredicted`
	`109`	`+ }`
`102`	`110`	`self.viewerShown = false`
`103`	`111`	`return`
`104`	`112`	`}`
`105`		`- self.dragOffset = .zero`
	`113`	`+ withAnimation(.interactiveSpring()) {`
	`114`	`+ self.dragOffset = .zero`
	`115`	`+ }`
`106`	`116`	`}`
`107`	`117`	`)`
`108`	`118`	`}`
`@@ -291,7 +301,6 @@ struct PinchToZoom: ViewModifier {`
`291`	`301`	`content`
`292`	`302`	`.scaleEffect(scale, anchor: anchor)`
`293`	`303`	`.offset(offset)`
`294`		`- .animation(isPinching ? .none : .spring())`
`295`	`304`	`.overlay(PinchZoom(scale: $scale, anchor: $anchor, offset: $offset, isPinching: $isPinching))`
`296`	`305`	`}`
`297`	`306`	`}`