fix: Always give same ID for window macOS (#1507)

Infomaniak · Aug 13, 2024 · 8bd83ec · 8bd83ec
2 parents d0f5ba8 + fafe4d2
commit 8bd83ec
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 15 deletions.
diff --git a/Mail/Commands/CustomCommands.swift b/Mail/Commands/CustomCommands.swift
@@ -48,7 +48,7 @@ struct CustomCommands: Commands {
             if #available(iOS 16.0, *) {
                 NewMessageCommand(mailboxManager: mainViewState?.mailboxManager)
 
-                NewWindowCommand(rootViewState: rootViewState)
+                NewWindowCommand()
             }
         }
 

diff --git a/Mail/Commands/NewWindowCommand.swift b/Mail/Commands/NewWindowCommand.swift
@@ -29,17 +29,15 @@ struct NewWindowCommand: View {
 
     @Environment(\.openWindow) private var openWindow
 
-    let rootViewState: RootViewState
-
     var body: some View {
         Button(MailResourcesStrings.Localizable.buttonNewWindow) {
             newWindow()
         }
         .keyboardShortcut("n", modifiers: [.option, .command])
     }
 
-    @MainActor func newWindow() {
+    func newWindow() {
         matomo.track(eventWithCategory: .menuAction, name: "newWindow")
-        openWindow(id: DesktopWindowIdentifier.mainWindowIdentifier(currentViewState: rootViewState))
+        openWindow(id: DesktopWindowIdentifier.mainWindowIdentifier)
     }
 }
diff --git a/Mail/UserAccountScene.swift b/Mail/UserAccountScene.swift
@@ -42,7 +42,7 @@ struct UserAccountScene: Scene {
     @StateObject private var rootViewState = RootViewState()
 
     var body: some Scene {
-        WindowGroup(id: DesktopWindowIdentifier.mainWindowIdentifier(currentViewState: rootViewState)) {
+        WindowGroup(id: DesktopWindowIdentifier.mainWindowIdentifier) {
             RootView()
                 .standardWindow()
                 .environmentObject(rootViewState)

diff --git a/MailCore/Utils/Constants.swift b/MailCore/Utils/Constants.swift
@@ -49,15 +49,7 @@ public enum DesktopWindowIdentifier {
     public static let settingsWindowIdentifier = "settings"
     public static let composeWindowIdentifier = "compose"
     public static let threadWindowIdentifier = "thread"
-
-    @MainActor
-    public static func mainWindowIdentifier(currentViewState: RootViewState) -> String {
-        if case .mainView(let mainViewState) = currentViewState.state {
-            return "Main-\(mainViewState.mailboxManager.mailbox.objectId)"
-        } else {
-            return "Main"
-        }
-    }
+    public static let mainWindowIdentifier = "main"
 }
 
 public struct URLConstants {