Simplify callbacks, to support getting child context on edit

Author: Reed Es

Sources/DetailerEditButton.swift

@@ -31,12 +31,12 @@ public struct DetailerEditButton<Element, Content>: View
 
     private let element: Element
     private let canEdit: CanEdit
-    private let onEdit: OnEdit?
+    private let onEdit: OnEdit
     private let label: () -> Content
 
     public init(element: Element,
                 canEdit: @escaping CanEdit = { _ in true },
-                onEdit: OnEdit?,
+                onEdit: @escaping OnEdit,
                 @ViewBuilder label: @escaping () -> Content)
     {
         self.element = element
@@ -48,7 +48,7 @@ public struct DetailerEditButton<Element, Content>: View
     // omitting explicit Label
     public init(element: Element,
                 canEdit: @escaping CanEdit = { _ in true },
-                onEdit: OnEdit?)
+                onEdit: @escaping OnEdit)
         where Content == Text // Label<Text, Image>
     {
         self.init(element: element,
@@ -60,18 +60,12 @@ public struct DetailerEditButton<Element, Content>: View
         }
     }
 
-    // MARK: Locals
-
-    private var netCanEdit: Bool {
-        onEdit != nil && canEdit(element)
-    }
-
     // MARK: Views
 
     public var body: some View {
-        Button(action: { onEdit?(element) }) {
+        Button(action: { onEdit(element) }) {
             label()
         }
-        .disabled(!netCanEdit)
+        .disabled(!canEdit(element))
     }
 }

Sources/EditDetailerContextMenu.swift

@@ -24,38 +24,25 @@ public struct EditDetailerContextMenu<Element>: ViewModifier
     public typealias CanEdit = (Element) -> Bool
     public typealias CanDelete = (Element) -> Bool
     public typealias OnDelete = (Element.ID) -> Void
-    
+    public typealias OnEdit = (Element) -> Void
+
     private let element: Element
-    @Binding private var toEdit: Element?
-    private let canEdit: CanEdit
     private let canDelete: CanDelete
     private let onDelete: OnDelete?
-    
+    private let canEdit: CanEdit
+    private let onEdit: OnEdit
+
     public init(_ element: Element,
-                _ toEdit: Binding<Element?>,
-                canEdit: @escaping CanEdit = { _ in true },
                 canDelete: @escaping CanDelete = { _ in true },
-                onDelete: OnDelete? = nil)
+                onDelete: OnDelete? = nil,
+                canEdit: @escaping CanEdit = { _ in true },
+                onEdit: @escaping OnEdit)
     {
         self.element = element
-        _toEdit = toEdit
-        self.canEdit = canEdit
         self.canDelete = canDelete
         self.onDelete = onDelete
-    }
-
-    // convenience to unwrap bound element
-    public init(_ element: Binding<Element>,
-                _ toEdit: Binding<Element?>,
-                canEdit: @escaping CanEdit = { _ in true },
-                canDelete: @escaping CanDelete = { _ in true },
-                onDelete: OnDelete? = nil)
-    {
-        self.init(element.wrappedValue,
-                  toEdit,
-                  canEdit: canEdit,
-                  canDelete: canDelete,
-                  onDelete: onDelete)
+        self.canEdit = canEdit
+        self.onEdit = onEdit
     }
 
     private var isDeleteAvailable: Bool {
@@ -65,7 +52,7 @@ public struct EditDetailerContextMenu<Element>: ViewModifier
     public func body(content: Content) -> some View {
         content
             .contextMenu {
-                DetailerEditButton(element: element, canEdit: canEdit) { toEdit = $0 }
+                DetailerEditButton(element: element, canEdit: canEdit) { onEdit($0) }
 
                 // NOTE if no delete handler, hide menu item entirely
                 if isDeleteAvailable {

Sources/EditDetailerSwipeMenu.swift

@@ -25,38 +25,25 @@ public struct EditDetailerSwipeMenu<Element>: ViewModifier
     public typealias CanEdit = (Element) -> Bool
     public typealias CanDelete = (Element) -> Bool
     public typealias OnDelete = (Element.ID) -> Void
+    public typealias OnEdit = (Element) -> Void
 
     private let element: Element
-    @Binding private var toEdit: Element?
-    private let canEdit: CanEdit
     private let canDelete: CanDelete
     private let onDelete: OnDelete?
+    private let canEdit: CanEdit
+    private let onEdit: OnEdit
 
     public init(_ element: Element,
-                _ toEdit: Binding<Element?>,
-                canEdit: @escaping CanEdit = { _ in true },
                 canDelete: @escaping CanDelete = { _ in true },
-                onDelete: OnDelete? = nil)
+                onDelete: OnDelete? = nil,
+                canEdit: @escaping CanEdit = { _ in true },
+                onEdit: @escaping OnEdit)
     {
         self.element = element
-        _toEdit = toEdit
-        self.canEdit = canEdit
         self.canDelete = canDelete
         self.onDelete = onDelete
-    }
-
-    // convenience to unwrap bound element
-    public init(_ element: Binding<Element>,
-                _ toEdit: Binding<Element?>,
-                canEdit: @escaping CanEdit = { _ in true },
-                canDelete: @escaping CanDelete = { _ in true },
-                onDelete: OnDelete? = nil)
-    {
-        self.init(element.wrappedValue,
-                  toEdit,
-                  canEdit: canEdit,
-                  canDelete: canDelete,
-                  onDelete: onDelete)
+        self.canEdit = canEdit
+        self.onEdit = onEdit
     }
 
     private var isDeleteAvailable: Bool {
@@ -66,7 +53,7 @@ public struct EditDetailerSwipeMenu<Element>: ViewModifier
     public func body(content: Content) -> some View {
         content
             .swipeActions(edge: .leading, allowsFullSwipe: true) {
-                DetailerEditButton(element: element, canEdit: canEdit) { toEdit = $0 }
+                DetailerEditButton(element: element, canEdit: canEdit) { onEdit($0) }
                     .tint(.accentColor)
             }
             .swipeActions(edge: .trailing, allowsFullSwipe: true) {