From ba071eb4c8afbf289635b7ca5046292f30b2e6a1 Mon Sep 17 00:00:00 2001
From: Thomas Ricouard <ricouard77@gmail.com>
Date: Tue, 23 Jan 2024 06:55:12 +0100
Subject: [PATCH] Fix status menu on Catalyst

---
 .../Row/Subviews/StatusRowContextMenu.swift   | 92 +++++++++++--------
 1 file changed, 55 insertions(+), 37 deletions(-)

diff --git a/Packages/StatusKit/Sources/StatusKit/Row/Subviews/StatusRowContextMenu.swift b/Packages/StatusKit/Sources/StatusKit/Row/Subviews/StatusRowContextMenu.swift
index 640f380d..bca52d48 100644
--- a/Packages/StatusKit/Sources/StatusKit/Row/Subviews/StatusRowContextMenu.swift
+++ b/Packages/StatusKit/Sources/StatusKit/Row/Subviews/StatusRowContextMenu.swift
@@ -228,45 +228,14 @@ struct StatusRowContextMenu: View {
               Label("account.action.mute", systemImage: "speaker.slash")
             }
           }
+          
+          #if targetEnvironment(macCatalyst)
+            accountContactMenuItems
+          #else
           ControlGroup {
-            Button {
-              viewModel.routerPath.presentedSheet = .mentionStatusEditor(account: viewModel.status.reblog?.account ?? viewModel.status.account, visibility: .pub)
-            } label: {
-              Label("status.action.mention", systemImage: "at")
-            }
-            Button {
-              viewModel.routerPath.presentedSheet = .mentionStatusEditor(account: viewModel.status.reblog?.account ?? viewModel.status.account, visibility: .direct)
-            } label: {
-              Label("status.action.message", systemImage: "tray.full")
-            }
-            if viewModel.authorRelationship?.blocking == true {
-              Button {
-                Task {
-                  do {
-                    let operationAccount = viewModel.status.reblog?.account ?? viewModel.status.account
-                    viewModel.authorRelationship = try await client.post(endpoint: Accounts.unblock(id: operationAccount.id))
-                  } catch {
-                    print("Error while unblocking: \(error.localizedDescription)")
-                  }
-                }
-              } label: {
-                Label("account.action.unblock", systemImage: "person.crop.circle.badge.exclamationmark")
-              }
-            } else {
-              Button {
-                Task {
-                  do {
-                    let operationAccount = viewModel.status.reblog?.account ?? viewModel.status.account
-                    viewModel.authorRelationship = try await client.post(endpoint: Accounts.block(id: operationAccount.id))
-                  } catch {
-                    print("Error while blocking: \(error.localizedDescription)")
-                  }
-                }
-              } label: {
-                Label("account.action.block", systemImage: "person.crop.circle.badge.xmark")
-              }
-            }
+            accountContactMenuItems
           }
+          #endif
         }
       }
       Section {
@@ -278,6 +247,55 @@ struct StatusRowContextMenu: View {
       }
     }
   }
+  
+  @ViewBuilder
+  private var accountContactMenuItems: some View {
+    Button {
+      #if targetEnvironment(macCatalyst) || os(visionOS)
+        openWindow(value: WindowDestinationEditor.mentionStatusEditor(account: viewModel.status.reblog?.account ?? viewModel.status.account, visibility: .pub))
+      #else
+        viewModel.routerPath.presentedSheet = .mentionStatusEditor(account: viewModel.status.reblog?.account ?? viewModel.status.account, visibility: .pub)
+      #endif
+    } label: {
+      Label("status.action.mention", systemImage: "at")
+    }
+    Button {
+      #if targetEnvironment(macCatalyst) || os(visionOS)
+        openWindow(value: WindowDestinationEditor.mentionStatusEditor(account: viewModel.status.reblog?.account ?? viewModel.status.account, visibility: .direct))
+      #else
+        viewModel.routerPath.presentedSheet = .mentionStatusEditor(account: viewModel.status.reblog?.account ?? viewModel.status.account, visibility: .direct)
+      #endif
+    } label: {
+      Label("status.action.message", systemImage: "tray.full")
+    }
+    if viewModel.authorRelationship?.blocking == true {
+      Button {
+        Task {
+          do {
+            let operationAccount = viewModel.status.reblog?.account ?? viewModel.status.account
+            viewModel.authorRelationship = try await client.post(endpoint: Accounts.unblock(id: operationAccount.id))
+          } catch {
+            print("Error while unblocking: \(error.localizedDescription)")
+          }
+        }
+      } label: {
+        Label("account.action.unblock", systemImage: "person.crop.circle.badge.exclamationmark")
+      }
+    } else {
+      Button {
+        Task {
+          do {
+            let operationAccount = viewModel.status.reblog?.account ?? viewModel.status.account
+            viewModel.authorRelationship = try await client.post(endpoint: Accounts.block(id: operationAccount.id))
+          } catch {
+            print("Error while blocking: \(error.localizedDescription)")
+          }
+        }
+      } label: {
+        Label("account.action.block", systemImage: "person.crop.circle.badge.xmark")
+      }
+    }
+  }
 }
 
 struct ActivityView: UIViewControllerRepresentable {