Simplified design, replacing isAdd binding with originalID in context

openalloc · Apr 3, 2022 · af03ebd · af03ebd
1 parent 6609654
commit af03ebd
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 20 deletions.
diff --git a/README.md b/README.md
@@ -71,7 +71,7 @@ struct ContentView: View {
 Then, to add basic support for a detail page, targeting both macOS and iOS, you'll need to:
 
 * A. Import the `SwiftDetailer` and `SwiftDetailerMenu` packages.
-* B. Add state properties, and a typealias for cleaner code.
+* B. Add state property for element to edit, and a typealias for cleaner code.
 * C. Give each row a menu (context for macOS; swipe for iOS).
 * D. Add a call to `editDetailer`, available as a modifier.
 * E. Include a `Form` containing the fields to edit, and ...
@@ -103,7 +103,6 @@ struct ContentView: View {
     ]
 
     @State private var toEdit: Fruit? = nil // B
-    @State private var isAdd: Bool = false
 
     typealias Context = DetailerContext<Fruit>
 
@@ -119,7 +118,7 @@ struct ContentView: View {
         }
         .editDetailer(.init(onSave: saveAction),
                       toEdit: $toEdit,
-                      isAdd: $isAdd,
+                      originalID: toEdit?.id,
                       detailContent: editDetail) // D
     }
 
@@ -155,7 +154,7 @@ struct ContentView: View {
 
 On macOS, ctrl-click (or right-click) on a row to invoke the context menu. On iOS, swipe the row to invoke the menu.
 
-For a full implementation, see the _DetailerDemo_ project (link below). It extends the example with operations to add new records, delete records, and validate input. 
+For a full implementation, with ability to add new records, see the _DetailerDemo_ project (link below). It extends the example with operations to add new records, delete records, and validate input. 
 
 It shows _Detailer_ used with `LazyVGrid` and `Table` containers.
 

diff --git a/Sources/DetailerContext.swift b/Sources/DetailerContext.swift
@@ -28,14 +28,14 @@ public struct DetailerContext<Element>
 
     public let config: Config
     public let onValidate: OnValidate
-    public let isAdd: Bool
+    public let originalID: Element.ID?
 
     public init(config: Config,
                 onValidate: @escaping OnValidate,
-                isAdd: Bool)
+                originalID: Element.ID? = nil)
     {
         self.config = config
         self.onValidate = onValidate
-        self.isAdd = isAdd
+        self.originalID = originalID
     }
 }
diff --git a/Sources/Internal/EditDetailBase.swift b/Sources/Internal/EditDetailBase.swift
@@ -31,7 +31,7 @@ where Element: Identifiable,
 
     let config: DetailerConfig<Element>
     let element: Element
-    @Binding var isAdd: Bool
+    let originalID: Element.ID?
     let detailContent: DetailContent
 
     // MARK: Locals
@@ -43,7 +43,7 @@ where Element: Identifiable,
     private var context: DetailerContext<Element> {
         DetailerContext<Element>(config: config,
                                  onValidate: validateAction,
-                                 isAdd: isAdd)
+                                 originalID: originalID)
     }
 
     private var isDeleteAvailable: Bool {
@@ -167,7 +167,6 @@ where Element: Identifiable,
     }
 
     private func dismissAction() {
-        isAdd = false
         presentationMode.wrappedValue.dismiss()
     }
 }
diff --git a/Sources/Internal/EditDetailC.swift b/Sources/Internal/EditDetailC.swift
@@ -28,13 +28,13 @@ where Element: Identifiable & ObservableObject,
 
     let config: DetailerConfig<Element>
     @ObservedObject var element: Element
-    @Binding var isAdd: Bool
+    let originalID: Element.ID?
     let detailContent: DetailContent
 
     var body: some View {
         EditDetailBase(config: config,
                        element: element,
-                       isAdd: $isAdd) { context in
+                       originalID: originalID) { context in
             detailContent(context, $element)
         }
     }

diff --git a/Sources/Internal/EditDetailR.swift b/Sources/Internal/EditDetailR.swift
@@ -28,13 +28,13 @@ where Element: Identifiable,
 
     let config: DetailerConfig<Element>
     @State var element: Element
-    @Binding var isAdd: Bool
+    let originalID: Element.ID?
     let detailContent: DetailContent
 
     var body: some View {
         EditDetailBase(config: config,
                        element: element,
-                       isAdd: $isAdd) { context in
+                       originalID: originalID) { context in
             detailContent(context, $element)
         }
     }

diff --git a/Sources/View+Detailer.swift b/Sources/View+Detailer.swift
@@ -27,7 +27,7 @@ public extension View {
     /// For Value data source
     func editDetailer<E, D>(_ config: DetailerConfig<E> = .init(),
                             toEdit: Binding<E?>,
-                            isAdd: Binding<Bool>,
+                            originalID: E.ID? = nil,
                             @ViewBuilder detailContent: @escaping EditContentR<E, D>) -> some View
     where E: Identifiable,
           D: View
@@ -36,13 +36,13 @@ public extension View {
 #if os(macOS)
             EditDetailR(config: config,
                         element: element,
-                        isAdd: isAdd,
+                        originalID: originalID,
                         detailContent: detailContent)
 #elseif os(iOS)
             NavigationView {
                 EditDetailR(config: config,
                             element: element,
-                            isAdd: isAdd,
+                            originalID: originalID,
                             detailContent: detailContent)
             }
             .navigationViewStyle(StackNavigationViewStyle())
@@ -53,7 +53,7 @@ public extension View {
     /// For Reference data source, including Core Data
     func editDetailer<E, D>(_ config: DetailerConfig<E> = .init(),
                             toEdit: Binding<E?>,
-                            isAdd: Binding<Bool>,
+                            originalID: E.ID? = nil,
                             @ViewBuilder detailContent: @escaping EditContentC<E, D>) -> some View
     where E: Identifiable & ObservableObject,
           D: View
@@ -62,13 +62,13 @@ public extension View {
 #if os(macOS)
             EditDetailC(config: config,
                         element: element,
-                        isAdd: isAdd,
+                        originalID: originalID,
                         detailContent: detailContent)
 #elseif os(iOS)
             NavigationView {
                 EditDetailC(config: config,
                             element: element,
-                            isAdd: isAdd,
+                            originalID: originalID,
                             detailContent: detailContent)
             }
             .navigationViewStyle(StackNavigationViewStyle())