Merge pull request #29 from ajunjunandtmac/main

Make compatible to swift 6.0 and iOS 18
fatbobman · Dec 19, 2024 · 0196fcf · 0196fcf
2 parents d2a50d3 + afe1e82
commit 0196fcf
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 11 deletions.
diff --git a/Sources/SwipeCell/SwipeCellViewModifier2.swift b/Sources/SwipeCell/SwipeCellViewModifier2.swift
@@ -39,18 +39,14 @@ extension SwipeCellModifier {
                         .environment(\.cellStatus, status)
                 }
                 .zIndex(3)
-                .highPriorityGesture(
-                    TapGesture(count: 1),
-                    including: currentCellID == nil ? .subviews : .none
-                )
                 .contentShape(Rectangle())
-                //解决Button冲突问题.
-                .onTapGesture(
-                    count: currentCellID != nil ? 1 : 4,
-                    perform: {
+                .highPriorityGesture(
+                    TapGesture(count: 1)
+                    .onEnded {
                         resetStatus()
                         dismissNotification()
-                    }
+                    },
+                    including: currentCellID == nil ? .subviews : .gesture
                 )
                 .offset(x: offset)
             }
@@ -183,7 +179,11 @@ extension View {
     @ViewBuilder
     func myGesture(_ g:_EndedGesture<_ChangedGesture<DragGesture>>) -> some View {
         if #available(iOS 18, *) {
-            simultaneousGesture(g)
+            #if compiler(>=6.0)
+            highPriorityGesture(g)
+            #else
+            gesture(g)
+            #endif
         } else {
             gesture(g)
         }

diff --git a/Sources/SwipeCell/SwipeCellViewModifier3.swift b/Sources/SwipeCell/SwipeCellViewModifier3.swift
@@ -8,8 +8,16 @@ import SwiftUI
 extension SwipeCellModifier {
     func getGesture() -> _EndedGesture<_ChangedGesture<DragGesture>> {
         //为了避免editMode切换时的异常动画,所以在进入editmode后仍然继续绘制Slots,只是对手势做了处理,避免了滑动
+        let nonEditGragMinDistance: CGFloat = {
+            if #available(iOS 18, *) {
+            #if compiler(>=6.0)
+                return 20
+            #endif
+            }
+            return 0
+        }()
         return DragGesture(
-            minimumDistance: editMode?.wrappedValue == .active ? 10000 : 0,
+            minimumDistance: editMode?.wrappedValue == .active ? 10000 : nonEditGragMinDistance,
             coordinateSpace: .local
         )
         .onChanged { value in