No need to initialize State directly. (#15)

pointfreeco · Feb 17, 2025 · f8714bf · f8714bf
1 parent 98a2e1b
commit f8714bf
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 21 deletions.
diff --git a/Examples/Reminders/ReminderForm.swift b/Examples/Reminders/ReminderForm.swift
@@ -12,31 +12,17 @@ struct ReminderFormView: View {
   @State var isPresentingTagsPopover = false
   @State var remindersList: RemindersList
   @State var reminder: Reminder
-  @State var selectedTags: [Tag]
+  @State var selectedTags: [Tag] = []
 
   @Dependency(\.defaultDatabase) private var database
   @Environment(\.dismiss) var dismiss
 
   init?(existingReminder: Reminder? = nil, remindersList: RemindersList) {
-    _remindersList = State(wrappedValue: remindersList)
-    if let existingReminder, let reminderID = existingReminder.id {
-      _reminder = State(wrappedValue: existingReminder)
-      do {
-        let tags = try _database.wrappedValue.read { db in
-          try Tag.all()
-            .joining(optional: Tag.hasMany(ReminderTag.self))
-            .filter(Column("reminderID").detached == reminderID)
-            .order(Column("name"))
-            .fetchAll(db)
-        }
-        _selectedTags = State(wrappedValue: tags)
-      } catch {
-        _selectedTags = State(wrappedValue: [])
-        reportIssue(error)
-      }
+    self.remindersList = remindersList
+    if let existingReminder {
+      reminder = existingReminder
     } else if let listID = remindersList.id {
-      _reminder = State(wrappedValue: Reminder(listID: listID))
-      _selectedTags = State(wrappedValue: [])
+      reminder = Reminder(listID: listID)
     } else {
       reportIssue("'list.id' is required to be non-nil.")
       return nil
@@ -137,6 +123,20 @@ struct ReminderFormView: View {
         }
       }
     }
+    .task { [reminderID = reminder.id] in
+      do {
+        selectedTags = try await database.read { db in
+          try Tag.all()
+            .joining(optional: Tag.hasMany(ReminderTag.self))
+            .filter(Column("reminderID").detached == reminderID)
+            .order(Column("name"))
+            .fetchAll(db)
+        }
+      } catch {
+        selectedTags = []
+        reportIssue(error)
+      }
+    }
     .navigationTitle(remindersList.name)
     .toolbar {
       ToolbarItem {

diff --git a/Examples/Reminders/RemindersListForm.swift b/Examples/Reminders/RemindersListForm.swift
@@ -11,9 +11,9 @@ struct RemindersListForm: View {
 
   init(existingList: RemindersList? = nil) {
     if let existingList {
-      _remindersList = State(wrappedValue: existingList)
+      remindersList = existingList
     } else {
-      _remindersList = State(wrappedValue: RemindersList())
+      remindersList = RemindersList()
     }
   }