Undo certificate

Alexander-Ignition · Jun 22, 2020 · d0326b0 · d0326b0
1 parent e0e491c
commit d0326b0
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/AirPushMac/ViewModels/PushViewModel.swift b/AirPushMac/ViewModels/PushViewModel.swift
@@ -19,9 +19,11 @@ final class PushViewModel: ObservableObject {
 
     @Published var result: PushResult?
     @Published var isLoading: Bool = false
-    @Published var certificate: Certificate?
+    @Published var certificate: Certificate? {
+        didSet { undo(\.certificate, oldValue) }
+    }
     @Published var push = PushNotification(deviceToken: "", body: "") {
-        didSet { registerUndo { $0.push = oldValue } }
+        didSet { undo(\.push, oldValue) }
     }
 
     // MARK: - Actions
@@ -36,8 +38,8 @@ final class PushViewModel: ObservableObject {
 
     // MARK: - Private
 
-    private func registerUndo(handler: @escaping (PushViewModel) -> Void) {
-        undoManager.registerUndo(withTarget: self, handler: handler)
+    private func undo<T>(_ keyPath: ReferenceWritableKeyPath<PushViewModel, T>, _ oldValue: T) {
+        undoManager.registerUndo(withTarget: self, handler: { $0[keyPath: keyPath] = oldValue })
     }
 }