Preventing tab drag gesture when close button is clicked.

Author: austincondiff

CodeEdit/Features/TabBar/Views/TabBarItemCloseButton.swift

@@ -13,6 +13,9 @@ struct TabBarItemCloseButton: View {
     var isDragging: Bool
     var closeAction: () -> Void
 
+    @Binding
+    var closeButtonGestureActive: Bool
+
     @Environment(\.colorScheme)
     var colorScheme
 
@@ -63,11 +66,11 @@ struct TabBarItemCloseButton: View {
         .foregroundColor(isPressingClose ? .primary : .secondary)
         .cornerRadius(2)
         .contentShape(Rectangle())
-        .highPriorityGesture(
+        .gesture(
             DragGesture(minimumDistance: 0)
                 .onChanged({ _ in
-                    print("pressed")
                     isPressingClose = true
+                    closeButtonGestureActive = true
                 })
                 .onEnded({ value in
                     if value.location.x > 0
@@ -77,8 +80,8 @@ struct TabBarItemCloseButton: View {
                         closeAction()
                     }
                     isPressingClose = false
+                    closeButtonGestureActive = false
                 })
-            , including: .gesture
         )
         .onHover { hover in
             isHoveringClose = hover
@@ -92,12 +95,15 @@ struct TabBarItemCloseButton: View {
 }
 
 struct TabBarItemCloseButton_Previews: PreviewProvider {
+    @State static var closeButtonGestureActive = true
+
     static var previews: some View {
         TabBarItemCloseButton(
             isActive: false,
             isHoveringTab: false,
             isDragging: false,
-            closeAction: { print("Close tab") }
+            closeAction: { print("Close tab") },
+            closeButtonGestureActive: $closeButtonGestureActive
         )
     }
 }

CodeEdit/Features/TabBar/Views/TabBarItemView.swift

@@ -56,6 +56,9 @@ struct TabBarItemView: View {
     @Binding
     private var onDragTabId: TabBarItemID?
 
+    @Binding
+    private var closeButtonGestureActive: Bool
+
     /// The current WorkspaceDocument object.
     ///
     /// It contains the workspace-related information like selection states.
@@ -112,12 +115,14 @@ struct TabBarItemView: View {
         expectedWidth: Binding<CGFloat>,
         item: TabBarItemRepresentable,
         draggingTabId: Binding<TabBarItemID?>,
-        onDragTabId: Binding<TabBarItemID?>
+        onDragTabId: Binding<TabBarItemID?>,
+        closeButtonGestureActive: Binding<Bool>
     ) {
         self._expectedWidth = expectedWidth
         self.item = item
         self._draggingTabId = draggingTabId
         self._onDragTabId = onDragTabId
+        self._closeButtonGestureActive = closeButtonGestureActive
     }
 
     @ViewBuilder
@@ -189,7 +194,8 @@ struct TabBarItemView: View {
                         isActive: isActive,
                         isHoveringTab: isHovering,
                         isDragging: draggingTabId != nil || onDragTabId != nil,
-                        closeAction: closeAction
+                        closeAction: closeAction,
+                        closeButtonGestureActive: $closeButtonGestureActive
                     )
                 }
                 .frame(maxWidth: .infinity, alignment: .leading)

CodeEdit/Features/TabBar/Views/TabBarView.swift

@@ -114,6 +114,9 @@ struct TabBarView: View {
     @State
     private var onDragLastLocation: CGPoint?
 
+    @State
+    private var closeButtonGestureActive: Bool = false
+
     /// Update the expected tab width when corresponding UI state is updated.
     ///
     /// This function will be called when the number of tabs or the parent size is changed.
@@ -132,6 +135,10 @@ struct TabBarView: View {
     private func makeTabDragGesture(id: TabBarItemID) -> some Gesture {
         return DragGesture(minimumDistance: 2, coordinateSpace: .global)
             .onChanged({ value in
+                if closeButtonGestureActive {
+                    return
+                }
+
                 if draggingTabId != id {
                     shouldOnDrag = false
                     draggingTabId = id
@@ -294,7 +301,8 @@ struct TabBarView: View {
                                         expectedWidth: $expectedTabWidth,
                                         item: item,
                                         draggingTabId: $draggingTabId,
-                                        onDragTabId: $onDragTabId
+                                        onDragTabId: $onDragTabId,
+                                        closeButtonGestureActive: $closeButtonGestureActive
                                     )
                                     .frame(height: TabBarView.height)
                                     .background(makeTabItemGeometryReader(id: id))