No longer with Identifiable constraint on Element

openalloc · Mar 4, 2022 · 1bb3292 · 1bb3292
1 parent 18cb2d6
commit 1bb3292
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 11 deletions.
diff --git a/Sources/DetailerDeleteButton.swift b/Sources/DetailerDeleteButton.swift
@@ -19,10 +19,10 @@
 import SwiftUI
 
 public struct DetailerDeleteButton<Element, Content>: View
-    where Element: Identifiable, Content: View
+    where Content: View
 {
     public typealias CanDelete = (Element) -> Bool
-    public typealias OnDelete = (Element.ID) -> Void
+    public typealias OnDelete = (Element) -> Void
 
     // MARK: Parameters
 
@@ -62,7 +62,7 @@ public struct DetailerDeleteButton<Element, Content>: View
     // MARK: Views
 
     public var body: some View {
-        Button(action: { onDelete?(element.id) }) {
+        Button(action: { onDelete?(element) }) {
             label()
         }
         .keyboardShortcut(.delete, modifiers: [])

diff --git a/Sources/DetailerEditButton.swift b/Sources/DetailerEditButton.swift
@@ -22,7 +22,7 @@ import SwiftUI
 ///  * Assumes the user will be allowed to edit (canEdit==true) even if no canEdit provided (canEdit==nil).
 ///
 public struct DetailerEditButton<Element, Content>: View
-    where Element: Identifiable, Content: View
+where Content: View
 {
     public typealias CanEdit = (Element) -> Bool
     public typealias OnEdit = (Element) -> Void

diff --git a/Sources/DetailerViewButton.swift b/Sources/DetailerViewButton.swift
@@ -19,7 +19,7 @@
 import SwiftUI
 
 public struct DetailerViewButton<Element, Content>: View
-    where Element: Identifiable, Content: View
+where Content: View
 {
     public typealias OnView = (Element) -> Void
 

diff --git a/Sources/EditDetailerContextMenu.swift b/Sources/EditDetailerContextMenu.swift
@@ -19,11 +19,10 @@
 import SwiftUI
 
 public struct EditDetailerContextMenu<Element>: ViewModifier
-    where Element: Identifiable
 {
     public typealias CanEdit = (Element) -> Bool
     public typealias CanDelete = (Element) -> Bool
-    public typealias OnDelete = (Element.ID) -> Void
+    public typealias OnDelete = (Element) -> Void
     public typealias OnEdit = (Element) -> Void
 
     private let element: Element

diff --git a/Sources/EditDetailerSwipeMenu.swift b/Sources/EditDetailerSwipeMenu.swift
@@ -20,11 +20,10 @@ import SwiftUI
 
 @available(iOS 15.0, macOS 12.0, tvOS 15.0, watchOS 8.0, *)
 public struct EditDetailerSwipeMenu<Element>: ViewModifier
-    where Element: Identifiable
 {
     public typealias CanEdit = (Element) -> Bool
     public typealias CanDelete = (Element) -> Bool
-    public typealias OnDelete = (Element.ID) -> Void
+    public typealias OnDelete = (Element) -> Void
     public typealias OnEdit = (Element) -> Void
 
     private let element: Element

diff --git a/Sources/ViewDetailerContextMenu.swift b/Sources/ViewDetailerContextMenu.swift
@@ -19,7 +19,6 @@
 import SwiftUI
 
 public struct ViewDetailerContextMenu<Element>: ViewModifier
-    where Element: Identifiable
 {
     private var element: Element
     @Binding private var toView: Element?

diff --git a/Sources/ViewDetailerSwipeMenu.swift b/Sources/ViewDetailerSwipeMenu.swift
@@ -20,7 +20,6 @@ import SwiftUI
 
 @available(iOS 15.0, macOS 12.0, tvOS 15.0, watchOS 8.0, *)
 public struct ViewDetailerSwipeMenu<Element>: ViewModifier
-    where Element: Identifiable
 {
     private var element: Element
     @Binding private var toView: Element?