From f08c90f8a06a4832ab120ca9e592f98fa117360a Mon Sep 17 00:00:00 2001
From: Thomas Ricouard <ricouard77@gmail.com>
Date: Mon, 16 Oct 2023 09:16:17 +0200
Subject: [PATCH] Fix #1419

---
 .../Status/Editor/Components/StatusEditorMediaView.swift | 6 +-----
 .../Status/Sources/Status/Editor/StatusEditorView.swift  | 9 ++++++++-
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/Packages/Status/Sources/Status/Editor/Components/StatusEditorMediaView.swift b/Packages/Status/Sources/Status/Editor/Components/StatusEditorMediaView.swift
index 3a3a7b28..a5f0c1a7 100644
--- a/Packages/Status/Sources/Status/Editor/Components/StatusEditorMediaView.swift
+++ b/Packages/Status/Sources/Status/Editor/Components/StatusEditorMediaView.swift
@@ -10,7 +10,7 @@ struct StatusEditorMediaView: View {
   @Environment(Theme.self) private var theme
   @Environment(CurrentInstance.self) private var currentInstance
   var viewModel: StatusEditorViewModel
-  @State private var editingContainer: StatusEditorMediaContainer?
+  @Binding var editingContainer: StatusEditorMediaContainer?
 
   @State private var isErrorDisplayed: Bool = false
 
@@ -40,10 +40,6 @@ struct StatusEditorMediaView: View {
       }
       .padding(.horizontal, .layoutPadding)
     }
-    .sheet(item: $editingContainer) { container in
-      StatusEditorMediaEditView(viewModel: viewModel, container: container)
-        .preferredColorScheme(theme.selectedScheme == .dark ? .dark : .light)
-    }
   }
 
   private func makeVideoAttachement(container: StatusEditorMediaContainer) -> some View {
diff --git a/Packages/Status/Sources/Status/Editor/StatusEditorView.swift b/Packages/Status/Sources/Status/Editor/StatusEditorView.swift
index 21a90903..3e1db09e 100644
--- a/Packages/Status/Sources/Status/Editor/StatusEditorView.swift
+++ b/Packages/Status/Sources/Status/Editor/StatusEditorView.swift
@@ -26,6 +26,8 @@ public struct StatusEditorView: View {
 
   @State private var isDismissAlertPresented: Bool = false
   @State private var isLanguageConfirmPresented = false
+  
+  @State private var editingContainer: StatusEditorMediaContainer?
 
   public init(mode: StatusEditorViewModel.Mode) {
     _viewModel = .init(initialValue: .init(mode: mode))
@@ -47,7 +49,8 @@ public struct StatusEditorView: View {
                      .placeholder(String(localized: "status.editor.text.placeholder"))
                      .setKeyboardType(preferences.isSocialKeyboardEnabled ? .twitter : .default)
                      .padding(.horizontal, .layoutPadding)
-            StatusEditorMediaView(viewModel: viewModel)
+            StatusEditorMediaView(viewModel: viewModel,
+                                  editingContainer: $editingContainer)
             if let status = viewModel.embeddedStatus {
               StatusEmbeddedView(status: status, client: client, routerPath: RouterPath())
                 .padding(.horizontal, .layoutPadding)
@@ -166,6 +169,10 @@ public struct StatusEditorView: View {
         }
       }
     }
+    .sheet(item: $editingContainer) { container in
+      StatusEditorMediaEditView(viewModel: viewModel, container: container)
+        .preferredColorScheme(theme.selectedScheme == .dark ? .dark : .light)
+    }
     .interactiveDismissDisabled(viewModel.shouldDisplayDismissWarning)
     .onChange(of: appAccounts.currentClient) { _, newValue in
       if viewModel.mode.isInShareExtension {