From 39df22f4bfc0dc408bb25a6165c6c57fe06cf4f6 Mon Sep 17 00:00:00 2001 From: Satindar Dhillon Date: Mon, 27 Jun 2022 16:43:29 -0700 Subject: [PATCH] move sheets to outside scope of mac home container --- .../App/Views/Home/HomeFeedViewMac.swift | 30 +++++++++++-------- 1 file changed, 18 insertions(+), 12 deletions(-) diff --git a/apple/OmnivoreKit/Sources/App/Views/Home/HomeFeedViewMac.swift b/apple/OmnivoreKit/Sources/App/Views/Home/HomeFeedViewMac.swift index 0dc402ac8..ff10e5e13 100644 --- a/apple/OmnivoreKit/Sources/App/Views/Home/HomeFeedViewMac.swift +++ b/apple/OmnivoreKit/Sources/App/Views/Home/HomeFeedViewMac.swift @@ -64,17 +64,6 @@ import Views } } } - .alert("Are you sure?", isPresented: $confirmationShown) { - Button("Remove Link", role: .destructive) { - if let itemToRemove = itemToRemove { - withAnimation { - viewModel.removeLink(dataService: dataService, objectID: itemToRemove.objectID) - self.itemToRemove = nil - } - } - } - Button("Cancel", role: .cancel) { self.itemToRemove = nil } - } } } @@ -120,7 +109,24 @@ import Views } } } - .onAppear { + .alert("Are you sure?", isPresented: $confirmationShown) { + Button("Remove Link", role: .destructive) { + if let itemToRemove = itemToRemove { + withAnimation { + viewModel.removeLink(dataService: dataService, objectID: itemToRemove.objectID) + self.itemToRemove = nil + } + } + } + Button("Cancel", role: .cancel) { self.itemToRemove = nil } + } + .sheet(item: $viewModel.itemUnderLabelEdit) { item in + ApplyLabelsView(mode: .item(item), onSave: nil) + } + .sheet(item: $viewModel.itemUnderTitleEdit) { item in + LinkedItemTitleEditView(item: item) + } + .task { if viewModel.items.isEmpty { loadItems(isRefresh: true) }