Add support for List onDelete, for iOS menu swipe #49

Author: Reed Es

README.md

@@ -460,7 +460,9 @@ List configuration is optional.
 `TablerListConfig<Element>.init` parameters:
 
 - `canMove: CanMove<Element>` - with a default of `{ _ in true }`, allowing any row to move (if `onMove` defined)
+- `canDelete: CanDelete<Element>` - with a default of `{ _ in true }`, allowing any row to be deleted (if `onDelete` defined), currently only via swipe menu on iOS
 - `onMove: OnMove<Element>?` - with a default of `nil`, prohibiting any move
+- `onDelete: OnDelete<Element>?` - with a default of `nil`, prohibiting any delete, currently only via swipe menu on iOS
 - `filter: Filter?` - with a default of `nil`, indicating no filtering
 - `onHover: (Element.ID, Bool) -> Void` - defaults to `{ _,_ in }`
 - `tablePadding: EdgeInsets` - per Base defaults

Sources/List/Internal/ListRowMod.swift

@@ -29,6 +29,7 @@ where Element: Identifiable
 
     func body(content: Content) -> some View {
         content
+            .deleteDisabled(!config.canDelete(element))
             .moveDisabled(!config.canMove(element))
 
 #if os(macOS) || targetEnvironment(macCatalyst)

Sources/List/TablerList.swift

@@ -84,6 +84,7 @@ where Element: Identifiable,
                     .overlay(rowOverlay(element))
             }
             .onMove(perform: config.onMove)
+            .onDelete(perform: config.onDelete)
         }
     }
 }

Sources/List/TablerList1.swift

@@ -89,6 +89,7 @@ public struct TablerList1<Element, Header, Footer, Row, RowBack, RowOver, Result
                     .overlay(rowOverlay(element))
             }
             .onMove(perform: config.onMove)
+            .onDelete(perform: config.onDelete)
         }
     }
 }

Sources/List/TablerList1B.swift

@@ -90,11 +90,13 @@ public struct TablerList1B<Element, Header, Footer, Row, RowBack, RowOver, Resul
                     }
                 }
                 .onMove(perform: config.onMove)
+            .onDelete(perform: config.onDelete)
             } else {
                 ForEach($results) { $element in
                     row($element)
                 }
                 .onMove(perform: config.onMove)
+            .onDelete(perform: config.onDelete)
             }
         }
     }

Sources/List/TablerList1C.swift

@@ -92,6 +92,7 @@ public struct TablerList1C<Element, Header, Footer, Row, RowBack, RowOver, Resul
                 }
             }
             .onMove(perform: config.onMove)
+            .onDelete(perform: config.onDelete)
         }
     }
 }

Sources/List/TablerListB.swift

@@ -85,11 +85,13 @@ public struct TablerListB<Element, Header, Footer, Row, RowBack, RowOver, Result
                     }
                 }
                 .onMove(perform: config.onMove)
+            .onDelete(perform: config.onDelete)
             } else {
                 ForEach($results) { $element in
                     row($element)
                 }
                 .onMove(perform: config.onMove)
+            .onDelete(perform: config.onDelete)
             }
         }
     }

Sources/List/TablerListC.swift

@@ -87,6 +87,7 @@ public struct TablerListC<Element, Header, Footer, Row, RowBack, RowOver, Result
                 }
             }
             .onMove(perform: config.onMove)
+            .onDelete(perform: config.onDelete)
         }
     }
 }

Sources/List/TablerListConfig.swift

@@ -23,12 +23,18 @@ public class TablerListConfig<Element>: TablerConfig<Element>
 {
     public typealias CanMove<Element> = (Element) -> Bool
     public typealias OnMove<Element> = (IndexSet, Int) -> Void
+    public typealias CanDelete<Element> = (Element) -> Bool
+    public typealias OnDelete<Element> = (IndexSet) -> Void
 
     public let canMove: CanMove<Element>
     public let onMove: OnMove<Element>?
+    public let canDelete: CanDelete<Element>
+    public let onDelete: OnDelete<Element>?
 
     public init(canMove: @escaping CanMove<Element> = { _ in true },
                 onMove: OnMove<Element>? = nil,
+                canDelete: @escaping CanDelete<Element> = { _ in true },
+                onDelete: OnDelete<Element>? = nil,
                 filter: Filter? = nil,
                 onHover: @escaping OnHover = { _,_ in },
                 tablePadding: EdgeInsets = TablerConfigDefaults.tablePadding,
@@ -38,6 +44,8 @@ public class TablerListConfig<Element>: TablerConfig<Element>
     {
         self.canMove = canMove
         self.onMove = onMove
+        self.canDelete = canDelete
+        self.onDelete = onDelete
 
         super.init(filter: filter,
                    onHover: onHover,

Sources/List/TablerListM.swift

@@ -89,6 +89,7 @@ public struct TablerListM<Element, Header, Footer, Row, RowBack, RowOver, Result
                     .overlay(rowOverlay(element))
             }
             .onMove(perform: config.onMove)
+            .onDelete(perform: config.onDelete)
         }
     }
 }