From 553d3d93178152d3874cf42dfe0dce9c9fa183d4 Mon Sep 17 00:00:00 2001
From: Jackson Harper <jacksonh@gmail.com>
Date: Mon, 6 Nov 2023 09:59:15 +0800
Subject: [PATCH] Fix share extension sheets on iPad so they dont show in
 splits, add dismiss button

---
 .../AppExtensions/Share/Views/AddNoteSheet.swift    |  2 +-
 .../AppExtensions/Share/Views/EditLabelsSheet.swift |  1 +
 .../Share/Views/ShareExtensionView.swift            | 13 +++++++++++++
 .../App/Views/LinkedItemMetadataEditView.swift      |  2 +-
 4 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/apple/OmnivoreKit/Sources/App/AppExtensions/Share/Views/AddNoteSheet.swift b/apple/OmnivoreKit/Sources/App/AppExtensions/Share/Views/AddNoteSheet.swift
index 6e9ff533d..f9a0bd759 100644
--- a/apple/OmnivoreKit/Sources/App/AppExtensions/Share/Views/AddNoteSheet.swift
+++ b/apple/OmnivoreKit/Sources/App/AppExtensions/Share/Views/AddNoteSheet.swift
@@ -53,6 +53,6 @@ public struct AddNoteSheet: View {
         }, label: {
           Text("Save").bold()
         }))
-    }
+    }.navigationViewStyle(StackNavigationViewStyle())
   }
 }
diff --git a/apple/OmnivoreKit/Sources/App/AppExtensions/Share/Views/EditLabelsSheet.swift b/apple/OmnivoreKit/Sources/App/AppExtensions/Share/Views/EditLabelsSheet.swift
index 3435aec05..a39547606 100644
--- a/apple/OmnivoreKit/Sources/App/AppExtensions/Share/Views/EditLabelsSheet.swift
+++ b/apple/OmnivoreKit/Sources/App/AppExtensions/Share/Views/EditLabelsSheet.swift
@@ -117,6 +117,7 @@ public struct EditLabelsSheet: View {
           Text("Done").bold()
         }))
     }
+    .navigationViewStyle(StackNavigationViewStyle())
     .environmentObject(viewModel.services.dataService)
     .task {
       await labelsViewModel.loadLabelsFromStore(dataService: viewModel.services.dataService)
diff --git a/apple/OmnivoreKit/Sources/App/AppExtensions/Share/Views/ShareExtensionView.swift b/apple/OmnivoreKit/Sources/App/AppExtensions/Share/Views/ShareExtensionView.swift
index db48203e2..2c5f7f2a9 100644
--- a/apple/OmnivoreKit/Sources/App/AppExtensions/Share/Views/ShareExtensionView.swift
+++ b/apple/OmnivoreKit/Sources/App/AppExtensions/Share/Views/ShareExtensionView.swift
@@ -255,6 +255,19 @@ public struct ShareExtensionView: View {
 
       HStack {
         Spacer()
+        if UIDevice.isIPad {
+          Button(action: {
+            extensionContext?.completeRequest(returningItems: [], completionHandler: nil)
+          }, label: {
+            Text("Dismiss")
+              .font(Font.system(size: 17, weight: .semibold))
+              .tint(Color.appGrayText)
+              .padding(20)
+          })
+            .frame(height: 50)
+            .cornerRadius(24)
+            .padding(.bottom, 15)
+        }
         Button(action: {
           viewModel.handleReadNowAction(extensionContext: extensionContext)
         }, label: {
diff --git a/apple/OmnivoreKit/Sources/App/Views/LinkedItemMetadataEditView.swift b/apple/OmnivoreKit/Sources/App/Views/LinkedItemMetadataEditView.swift
index 6258fee2f..b3477a748 100644
--- a/apple/OmnivoreKit/Sources/App/Views/LinkedItemMetadataEditView.swift
+++ b/apple/OmnivoreKit/Sources/App/Views/LinkedItemMetadataEditView.swift
@@ -117,7 +117,7 @@ struct LinkedItemMetadataEditView: View {
               )
             }
           }
-      }
+      }.navigationViewStyle(StackNavigationViewStyle())
     }
   #else
     var macOSBody: some View {