Fix laggy dragging

skjiisa · skjiisa · commit 09eb5396187e · 2021-03-30T22:10:31.000-06:00
diff --git a/Sources/ImageViewer/ImageViewer.swift b/Sources/ImageViewer/ImageViewer.swift
@@ -88,7 +88,9 @@ public struct ImageViewer: View {
                                         
                                         return
                                     }
-                                    self.dragOffset = .zero
+                                    withAnimation(.interactiveSpring()) {
+                                        self.dragOffset = .zero
+                                    }
                                 }
                             )
                             
@@ -273,7 +275,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
@@ -79,7 +79,9 @@ public struct ImageViewerRemote: View {
                                                 self.viewerShown = false
                                                 return
                                             }
-                                            self.dragOffset = .zero
+                                            withAnimation(.interactiveSpring()) {
+                                                self.dragOffset = .zero
+                                            }
                                         }
                                     )
                                 })
@@ -102,7 +104,9 @@ public struct ImageViewerRemote: View {
                                                     self.viewerShown = false
                                                     return
                                                 }
-                                                self.dragOffset = .zero
+                                                withAnimation(.interactiveSpring()) {
+                                                    self.dragOffset = .zero
+                                                }
                                             }
                                         )
                                 }
@@ -291,7 +295,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
`@@ -88,7 +88,9 @@ public struct ImageViewer: View {`
`88`	`88`
`89`	`89`	`return`
`90`	`90`	`}`
`91`		`- self.dragOffset = .zero`
	`91`	`+ withAnimation(.interactiveSpring()) {`
	`92`	`+ self.dragOffset = .zero`
	`93`	`+ }`
`92`	`94`	`}`
`93`	`95`	`)`
`94`	`96`
`@@ -273,7 +275,6 @@ struct PinchToZoom: ViewModifier {`
`273`	`275`	`content`
`274`	`276`	`.scaleEffect(scale, anchor: anchor)`
`275`	`277`	`.offset(offset)`
`276`		`- .animation(isPinching ? .none : .spring())`
`277`	`278`	`.overlay(PinchZoom(scale: $scale, anchor: $anchor, offset: $offset, isPinching: $isPinching))`
`278`	`279`	`}`
`279`	`280`	`}`
Original file line number	Diff line number	Diff line change
`@@ -79,7 +79,9 @@ public struct ImageViewerRemote: View {`
`79`	`79`	`self.viewerShown = false`
`80`	`80`	`return`
`81`	`81`	`}`
`82`		`- self.dragOffset = .zero`
	`82`	`+ withAnimation(.interactiveSpring()) {`
	`83`	`+ self.dragOffset = .zero`
	`84`	`+ }`
`83`	`85`	`}`
`84`	`86`	`)`
`85`	`87`	`})`
`@@ -102,7 +104,9 @@ public struct ImageViewerRemote: View {`
`102`	`104`	`self.viewerShown = false`
`103`	`105`	`return`
`104`	`106`	`}`
`105`		`- self.dragOffset = .zero`
	`107`	`+ withAnimation(.interactiveSpring()) {`
	`108`	`+ self.dragOffset = .zero`
	`109`	`+ }`
`106`	`110`	`}`
`107`	`111`	`)`
`108`	`112`	`}`
`@@ -291,7 +295,6 @@ struct PinchToZoom: ViewModifier {`
`291`	`295`	`content`
`292`	`296`	`.scaleEffect(scale, anchor: anchor)`
`293`	`297`	`.offset(offset)`
`294`		`- .animation(isPinching ? .none : .spring())`
`295`	`298`	`.overlay(PinchZoom(scale: $scale, anchor: $anchor, offset: $offset, isPinching: $isPinching))`
`296`	`299`	`}`
`297`	`300`	`}`