Use NSHostingView subclass to cover more cases and avoid DispatchQueu…

…e hack

DuckDuckGo/SecureVault/View/AutoRecalculatingKeyViewHostingView.swift

@@ -0,0 +1,28 @@
+//
+//  AutoRecalculatingKeyViewHostingView.swift
+//
+//  Copyright © 2025 DuckDuckGo. All rights reserved.
+//
+//  Licensed under the Apache License, Version 2.0 (the "License");
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//
+//  http://www.apache.org/licenses/LICENSE-2.0
+//
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//
+
+import SwiftUI
+
+final class AutoRecalculatingKeyViewHostingView<Content: View>: NSHostingView<Content> {
+    override func layout() {
+        super.layout()
+
+        // Fix not being able to tab between TextFields by manually updating key view loop after SwiftUI has finished layout. This doesn't happen automatically because MainWindow sets autorecalculatesKeyViewLoop to false.
+        self.window?.recalculateKeyViewLoop()
+    }
+}

DuckDuckGo/SecureVault/View/PasswordManagementViewController.swift

@@ -462,7 +462,7 @@ final class PasswordManagementViewController: NSViewController {
 
         self.itemModel = itemModel
 
-        let view = NSHostingView(rootView: PasswordManagementLoginItemView().environmentObject(itemModel))
+        let view = AutoRecalculatingKeyViewHostingView(rootView: PasswordManagementLoginItemView().environmentObject(itemModel))
         replaceItemContainerChildView(with: view)
     }
 
@@ -478,7 +478,7 @@ final class PasswordManagementViewController: NSViewController {
 
         self.itemModel = itemModel
 
-        let view = NSHostingView(rootView: PasswordManagementIdentityItemView().environmentObject(itemModel))
+        let view = AutoRecalculatingKeyViewHostingView(rootView: PasswordManagementIdentityItemView().environmentObject(itemModel))
         replaceItemContainerChildView(with: view)
     }
 
@@ -494,7 +494,7 @@ final class PasswordManagementViewController: NSViewController {
 
         self.itemModel = itemModel
 
-        let view = NSHostingView(rootView: PasswordManagementNoteItemView().environmentObject(itemModel))
+        let view = AutoRecalculatingKeyViewHostingView(rootView: PasswordManagementNoteItemView().environmentObject(itemModel))
         replaceItemContainerChildView(with: view)
     }
 
@@ -510,7 +510,7 @@ final class PasswordManagementViewController: NSViewController {
 
         self.itemModel = itemModel
 
-        let view = NSHostingView(rootView: PasswordManagementCreditCardItemView().environmentObject(itemModel))
+        let view = AutoRecalculatingKeyViewHostingView(rootView: PasswordManagementCreditCardItemView().environmentObject(itemModel))
         replaceItemContainerChildView(with: view)
     }
 
@@ -531,11 +531,6 @@ final class PasswordManagementViewController: NSViewController {
         itemContainer.addSubview(view)
         itemContainer.wantsLayer = true
         itemContainer.layer?.masksToBounds = false
-
-        // MainWindow sets autorecalculatesKeyViewLoop to false, so need to call recalculateKeyViewLoop() when view changes.
-        DispatchQueue.main.async {
-            view.window?.recalculateKeyViewLoop()
-        }
     }
 
     private func doSaveCredentials(_ credentials: SecureVaultModels.WebsiteCredentials) {