various refinements

Author: Reed Es

Sources/Internal/EditDetail.swift

@@ -95,7 +95,7 @@ struct EditDetail<Element, Detail>: View
 
             ToolbarItem(placement: .cancellationAction) {
                 Button(action: cancelAction) {
-                    Text(isSaveAvailable ? "Cancel" : "Close")
+                    Text("Cancel")
                 }
                 .keyboardShortcut(.cancelAction)
             }
@@ -104,7 +104,6 @@ struct EditDetail<Element, Detail>: View
                     Text("Save")
                 }
                 .keyboardShortcut(.defaultAction)
-                .opacity(isSaveAvailable ? 1 : 0)
                 .disabled(!canSave)
             }
         }

Sources/Menus/EditDetailerContextMenu.swift

@@ -44,12 +44,18 @@ public struct EditDetailerContextMenu<Element>: ViewModifier
                   element.wrappedValue)
     }
 
+    private var isDeleteAvailable: Bool {
+        config.onDelete != nil
+    }
+
     public func body(content: Content) -> some View {
         content
             .contextMenu {
                 DetailerEditButton(element: element, canEdit: config.canEdit) { toEdit = $0 }
-                Divider()
-                DetailerDeleteButton(element: element, canDelete: config.canDelete, onDelete: config.onDelete)
+                if isDeleteAvailable {
+                    Divider()
+                    DetailerDeleteButton(element: element, canDelete: config.canDelete, onDelete: config.onDelete)
+                }
             }
     }
 }

Sources/Menus/EditDetailerSwipeMenu.swift

@@ -45,15 +45,23 @@ public struct EditDetailerSwipeMenu<Element>: ViewModifier
                   element.wrappedValue)
     }
 
+    private var isDeleteAvailable: Bool {
+        config.onDelete != nil
+    }
+
     public func body(content: Content) -> some View {
         content
             .swipeActions(edge: .leading, allowsFullSwipe: true) {
                 DetailerEditButton(element: element, canEdit: config.canEdit) { toEdit = $0 }
                     .tint(.accentColor)
             }
             .swipeActions(edge: .trailing, allowsFullSwipe: true) {
-                DetailerDeleteButton(element: element, canDelete: config.canDelete, onDelete: config.onDelete)
-                    .tint(.red)
+                if isDeleteAvailable {
+                    DetailerDeleteButton(element: element, canDelete: config.canDelete, onDelete: config.onDelete)
+                        .tint(.red)
+                } else {
+                    EmptyView()
+                }
             }
     }
 }