Fixed: Gesture precedence in watchOS (#3)

fredyshox · May 14, 2020 · 22b178e · 22b178e
1 parent 32bcb64
commit 22b178e
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 14 deletions.
diff --git a/Examples/PageViewDemo WatchKit Extension/ContentView.swift b/Examples/PageViewDemo WatchKit Extension/ContentView.swift
@@ -13,18 +13,18 @@ struct ContentView: View {
     var body: some View {
         // Horizontal
         HPageView {
+            CustomButtonView()
+            CustomButtonView()
+            CustomButtonView()
             CustomView()
             CustomListView()
             CustomView()
-            CustomView()
-            CustomView()
-            CustomView()
         }.edgesIgnoringSafeArea(.init(arrayLiteral: .leading, .trailing, .bottom))
         // Vertical
 //        VPageView {
-//            CustomView()
-//            CustomListView()
-//            CustomView()
+//            CustomButtonView()
+//            CustomButtonView()
+//            CustomButtonView()
 //            CustomView()
 //            CustomView()
 //            CustomView()

diff --git a/Examples/PageViewDemo/Views.swift b/Examples/PageViewDemo/Views.swift
@@ -14,6 +14,23 @@ extension View {
     }
 }
 
+struct CustomButtonView: View {
+    var body: some View {
+        VStack {
+            Button(action: {
+                print("Button 1 tapped")
+            }, label: {
+                Text("Button 1")
+            })
+            Button(action: {
+                print("Button 2 tapped")
+            }, label: {
+                Text("Button 2")
+            })
+        }
+    }
+}
+
 struct CustomView: View {
     var body: some View {
         VStack {

diff --git a/Sources/PageView.swift b/Sources/PageView.swift
@@ -40,10 +40,10 @@ public struct HPageView<Pages>: View where Pages: View {
                         compositeView: HorizontalPageStack(pages: self.pages, geometry: geometry),
                         pageControlBuilder: pageControlBuilder)
                 .contentShape(Rectangle())
-                   .gesture(DragGesture(minimumDistance: 8.0)
-                       .onChanged({ self.onDragChanged($0, geometry: geometry) })
-                       .onEnded({ self.onDragEnded($0, geometry: geometry) })
-                   )
+                .highPriorityGesture(DragGesture(minimumDistance: 8.0)
+                    .onChanged({ self.onDragChanged($0, geometry: geometry) })
+                    .onEnded({ self.onDragEnded($0, geometry: geometry) })
+                )
         }
     }
 
@@ -89,10 +89,10 @@ public struct VPageView<Pages>: View where Pages: View {
                         compositeView: VerticalPageStack(pages: self.pages, geometry: geometry),
                         pageControlBuilder: pageControlBuilder)
                 .contentShape(Rectangle())
-                   .gesture(DragGesture(minimumDistance: 8.0)
-                       .onChanged({ self.onDragChanged($0, geometry: geometry) })
-                       .onEnded({ self.onDragEnded($0, geometry: geometry) })
-                   )
+                .highPriorityGesture(DragGesture(minimumDistance: 8.0)
+                    .onChanged({ self.onDragChanged($0, geometry: geometry) })
+                    .onEnded({ self.onDragEnded($0, geometry: geometry) })
+                )
         }
     }