Merge pull request #1135 from kiwix/1104-side-menu-optimalisation

1104 side menu optimalization

Author: kelson42

App/App_macOS.swift

@@ -167,7 +167,9 @@ struct RootView: View {
     @Environment(\.openWindow) var openWindow
     @Environment(\.controlActiveState) var controlActiveState
     @StateObject private var navigation = NavigationViewModel()
+    @State private var currentNavItem: NavigationItem?
     @StateObject private var windowTracker = WindowTracker()
+    @State private var paymentButtonLabel: PayWithApplePayButtonLabel?
 
     private let primaryItems: [NavigationItem] = [.bookmarks]
     private let libraryItems: [NavigationItem] = [.opened, .categories, .downloads, .new]
@@ -179,7 +181,7 @@ struct RootView: View {
 
     var body: some View {
         NavigationSplitView {
-            List(selection: $navigation.currentItem) {
+            List(selection: $currentNavItem) {
                 ForEach(
                     [NavigationItem.tab(objectID: navigation.currentTabId)] + primaryItems,
                     id: \.self
@@ -196,7 +198,7 @@ struct RootView: View {
             }
             .frame(minWidth: 160)
             .safeAreaInset(edge: .bottom) {
-                if Payment.paymentButtonType() != nil && Brand.hideDonation != true {
+                if paymentButtonLabel != nil && Brand.hideDonation != true {
                     SupportKiwixButton {
                         openWindow(id: "donation")
                     }
@@ -229,6 +231,9 @@ struct RootView: View {
         .modifier(OpenFileHandler())
         .modifier(SaveContentHandler())
         .environmentObject(navigation)
+        .onChange(of: currentNavItem) { newValue in
+            navigation.currentItem = newValue
+        }
         .onOpenURL { url in
             if url.isFileURL {
                 // from opening an external file
@@ -267,7 +272,7 @@ struct RootView: View {
             }
             guard controlActiveState == .key else { return }
             let tabID = navigation.currentTabId
-            navigation.currentItem = .tab(objectID: tabID)
+            currentNavItem = .tab(objectID: tabID)
             BrowserViewModel.getCached(tabID: tabID).load(url: url)
         }
         .onReceive(tabCloses) { publisher in
@@ -303,15 +308,20 @@ struct RootView: View {
             switch AppType.current {
             case .kiwix:
                 await LibraryOperations.reopen()
-                navigation.currentItem = .tab(objectID: navigation.currentTabId)
+                currentNavItem = .tab(objectID: navigation.currentTabId)
                 LibraryOperations.scanDirectory(URL.documentDirectory)
                 LibraryOperations.applyFileBackupSetting()
                 DownloadService.shared.restartHeartbeatIfNeeded()
             case let .custom(zimFileURL):
                 await LibraryOperations.open(url: zimFileURL)
                 ZimMigration.forCustomApps()
-                navigation.currentItem = .tab(objectID: navigation.currentTabId)
+                currentNavItem = .tab(objectID: navigation.currentTabId)
+            }
+            // MARK: - payment button init
+            if Brand.hideDonation == false {
+                paymentButtonLabel = await Payment.paymentButtonTypeAsync()
             }
+            
             // MARK: - migrations
             if !ProcessInfo.processInfo.arguments.contains("testing") {
                 _ = MigrationService().migrateAll()

Model/Payment.swift

@@ -118,8 +118,8 @@ struct Payment {
         .init(value: 10)
     ]
 
-    /// Checks Apple Pay capabilities, and returns the button label accrodingly
-    /// Setup button if no cards added yet,
+    /// Checks Apple Pay capabilities, and returns the button label accordingly
+    /// - Returns: Setup button if no cards added yet,
     /// nil if Apple Pay is not supported
     /// or donation button, if all is OK
     static func paymentButtonType() -> PayWithApplePayButtonLabel? {
@@ -136,6 +136,20 @@ struct Payment {
         }
         return nil
     }
+    
+    /// Async version of ``paymentButtonType()`` with low priority
+    /// - Returns: Setup button if no cards added yet,
+    /// nil if Apple Pay is not supported
+    /// or donation button, if all is OK
+    static func paymentButtonTypeAsync() async -> PayWithApplePayButtonLabel? {
+        let task = Task<PayWithApplePayButtonLabel?, Never>(priority: .low) {
+            Self.paymentButtonType()
+        }
+        guard let buttonLabel = await task.result.get() else {
+            return nil
+        }
+        return buttonLabel
+    }
 
     func donationRequest(for selectedAmount: SelectedAmount) -> PKPaymentRequest {
         let request = PKPaymentRequest()