Patch 1.1.3

fix:
- Fixed a problem with text fields (#43)

Author: FulcrumOne

MijickNavigationView.podspec

@@ -5,7 +5,7 @@ Pod::Spec.new do |s|
   NavigationView is a free and open-source library dedicated for SwiftUI that makes navigation easier and much cleaner.
                                DESC
 
-  s.version               = '1.1.2'
+  s.version               = '1.1.3'
   s.ios.deployment_target = '15.0'
   s.swift_version         = '5.0'
 

README.md

@@ -19,7 +19,7 @@
 <p align="center">
     <a href="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/Mijick/NavigationView-Demo" rel="nofollow">Try demo we prepared</a>
     |
-    <a href="https://github.com/orgs/Mijick/projects/5" rel="nofollow">Roadmap</a>
+    <a href="https://mijick.notion.site/1308512b2a6c483fb9a7e6804530ef87?v=6b992a9f361047348dfd9cc94c954b67&pvs=74" rel="nofollow">Roadmap</a>
     |
     <a href="https://github.com/Mijick/NavigationView/issues/new" rel="nofollow">Propose a new feature</a>
 </p>

Sources/Internal/Extensions/Animation++.swift

@@ -12,5 +12,5 @@
 import SwiftUI
 
 extension Animation {
-    static var keyboard: Animation { .interpolatingSpring(mass: 3, stiffness: 1000, damping: 500, initialVelocity: 6.4) }
+    static func keyboard(withDelay: Bool) -> Animation { .easeOut(duration: 0.25).delay(withDelay ? 0.1 : 0) }
 }

Sources/Internal/Managers/KeyboardManager.swift

@@ -13,7 +13,7 @@ import SwiftUI
 import Combine
 
 class KeyboardManager: ObservableObject {
-    @Published private(set) var isActive: Bool = false
+    @Published private(set) var height: CGFloat = .zero
     private var subscription: [AnyCancellable] = []
 
     static let shared: KeyboardManager = .init()
@@ -28,17 +28,18 @@ extension KeyboardManager {
 // MARK: - Show / Hide Events
 private extension KeyboardManager {
     func subscribeToKeyboardEvents() { Publishers.Merge(keyboardWillOpenPublisher, keyboardWillHidePublisher)
-        .sink { self.isActive = $0 }
+        .sink { self.height = $0 }
         .store(in: &subscription)
     }
 }
 private extension KeyboardManager {
-    var keyboardWillOpenPublisher: Publishers.Map<NotificationCenter.Publisher, Bool> { NotificationCenter.default
-        .publisher(for: UIResponder.keyboardDidShowNotification)
-        .map { _ in true }
+    var keyboardWillOpenPublisher: Publishers.CompactMap<NotificationCenter.Publisher, CGFloat> { NotificationCenter.default
+        .publisher(for: UIResponder.keyboardWillShowNotification)
+        .compactMap { $0.userInfo?[UIResponder.keyboardFrameEndUserInfoKey] as? CGRect }
+        .map { $0.height }
     }
-    var keyboardWillHidePublisher: Publishers.Map<NotificationCenter.Publisher, Bool> { NotificationCenter.default
+    var keyboardWillHidePublisher: Publishers.Map<NotificationCenter.Publisher, CGFloat> { NotificationCenter.default
         .publisher(for: UIResponder.keyboardWillHideNotification)
-        .map { _ in false }
+        .map { _ in .zero }
     }
 }

Sources/Internal/Managers/ScreenManager.swift

@@ -36,7 +36,7 @@ extension ScreenManager {
 extension ScreenManager {
     func getSafeAreaValue(for edge: Edge.Set) -> CGFloat { switch edge {
         case .top: safeArea.top
-        case .bottom: safeArea.bottom
+        case .bottom: KeyboardManager.shared.height > 0 ? KeyboardManager.shared.height : safeArea.bottom
         case .leading: safeArea.left
         case .trailing: safeArea.right
         default: 0

Sources/Internal/Views/NavigationView.swift

@@ -24,11 +24,12 @@ struct NavigationView: View {
     var body: some View {
         ZStack { ForEach(temporaryViews, id: \.id, content: createItem) }
             .ignoresSafeArea()
+            .frame(maxWidth: .infinity, maxHeight: .infinity)
             .gesture(createDragGesture())
             .onChange(of: stack.views, perform: onViewsChanged)
             .onChange(of: isGestureActive, perform: onDragGestureEnded)
             .onAnimationCompleted(for: animatableData.opacity, perform: onAnimationCompleted)
-            .animation(.keyboard, value: keyboardManager.isActive)
+            .animation(.keyboard(withDelay: isKeyboardVisible), value: isKeyboardVisible)
     }
 }
 private extension NavigationView {
@@ -105,8 +106,8 @@ private extension NavigationView {
               ignoredAreas.edges.isOne(of: .init(edge), .all)
         else { return screenManager.getSafeAreaValue(for: edge) }
 
-        if ignoredAreas.regions.isOne(of: .keyboard, .all) && keyboardManager.isActive { return 0 }
-        if ignoredAreas.regions.isOne(of: .container, .all) && !keyboardManager.isActive { return 0 }
+        if ignoredAreas.regions.isOne(of: .keyboard, .all) && isKeyboardVisible { return 0 }
+        if ignoredAreas.regions.isOne(of: .container, .all) && !isKeyboardVisible { return 0 }
         return screenManager.getSafeAreaValue(for: edge)
     }
     func getBackground(_ item: AnyNavigatableView) -> Color { getConfig(item).backgroundColour ?? config.backgroundColour }
@@ -308,6 +309,7 @@ private extension NavigationView {
 // MARK: - Helpers
 private extension NavigationView {
     var gestureProgress: CGFloat { gestureData.translation / (stack.transitionAnimation == .verticalSlide ? screenManager.size.height : screenManager.size.width) }
+    var isKeyboardVisible: Bool { keyboardManager.height > 0 }
 }
 
 // MARK: - Configurables