[016] Change implementation of .navStatusBar(isHidde: Bool) to more N…

…ative SwiftUI.
edon2005 · Jan 10, 2025 · 73684d6 · 73684d6
1 parent 552dc9b
commit 73684d6
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 11 deletions.
diff --git a/Sources/CoordinatorX/Navigation/NavigationContext.swift b/Sources/CoordinatorX/Navigation/NavigationContext.swift
@@ -8,8 +8,6 @@
 @preconcurrency import Combine
 import SwiftUI
 
-let statusBarHiddenSubject = CurrentValueSubject<Bool, Never>(false)
-
 public struct NavigationContext<RouteType: Route,
                                 CoordinatorType: NavigationCoordinator>: Context where CoordinatorType.RouteType == RouteType {
 
@@ -54,8 +52,9 @@ public struct NavigationContext<RouteType: Route,
             .background(transition.backgroundColor)
             .transition(transition.style)
         }
-        .onReceive(statusBarHiddenSubject.eraseToAnyPublisher()) { value in
-            isStatusBarHidden = value
+        .onPreferenceChange(NavStatusBarHiddenKey.self) { [$isStatusBarHidden] value in
+            guard let value else { return }
+            $isStatusBarHidden.wrappedValue = value
         }
         .statusBar(hidden: isStatusBarHidden)
     }

diff --git a/Sources/CoordinatorX/Utils/StatusBarModifiers.swift b/Sources/CoordinatorX/Utils/StatusBarModifiers.swift
@@ -7,19 +7,18 @@
 
 import SwiftUI
 
-struct StatusBar: ViewModifier {
 
-    let isHidden: Bool
+struct NavStatusBarHiddenKey: PreferenceKey {
+    static let defaultValue: Bool? = nil
 
-    func body(content: Content) -> some View {
-        let _ = statusBarHiddenSubject.send(isHidden)
-        content
+    static func reduce(value: inout Bool?, nextValue: () -> Bool?) {
+        guard let result = nextValue() else { return }
+        value = result
     }
 }
 
 extension View {
     public func navStatusBar(isHidden: Bool) -> some View {
-        let statusBar = StatusBar(isHidden: isHidden)
-        return modifier(statusBar)
+        preference(key: NavStatusBarHiddenKey.self, value: isHidden)
     }
 }