- Fixed #2042 where in some cases (in react native) the content scrollview was not restored back to original position.

Author: hackiftekhar

IQKeyboardManagerSwift/Configuration/IQActiveConfiguration.swift

@@ -68,8 +68,7 @@ internal final class IQActiveConfiguration {
 
     private func sendEvent() {
 
-        if let textFieldViewInfo = textFieldViewInfo,
-           let rootControllerConfiguration = rootControllerConfiguration,
+        if let rootControllerConfiguration = rootControllerConfiguration,
            rootControllerConfiguration.isReady {
             if keyboardInfo.keyboardShowing {
                 if lastEvent == .hide {
@@ -87,13 +86,6 @@ internal final class IQActiveConfiguration {
                     }, completion: nil)
                 }
             }
-        } else if textFieldViewInfo == nil, let rootControllerConfiguration = rootControllerConfiguration {
-            if rootControllerConfiguration.hasChanged {
-                animate(alongsideTransition: {
-                    rootControllerConfiguration.restore()
-                }, completion: nil)
-            }
-            self.rootControllerConfiguration = nil
         }
     }
 
@@ -190,7 +182,7 @@ extension IQActiveConfiguration {
 
     typealias ConfigurationCompletion = (_ event: Event,
                                          _ keyboardInfo: IQKeyboardInfo,
-                                         _ textFieldInfo: IQTextFieldViewInfo) -> Void
+                                         _ textFieldInfo: IQTextFieldViewInfo?) -> Void
 
     func registerChange(identifier: AnyHashable, changeHandler: @escaping ConfigurationCompletion) {
         changeObservers[identifier] = changeHandler
@@ -200,7 +192,7 @@ extension IQActiveConfiguration {
         changeObservers[identifier] = nil
     }
 
-    private func notify(event: Event, keyboardInfo: IQKeyboardInfo, textFieldViewInfo: IQTextFieldViewInfo) {
+    private func notify(event: Event, keyboardInfo: IQKeyboardInfo, textFieldViewInfo: IQTextFieldViewInfo?) {
         lastEvent = event
 
         for block in changeObservers.values {

IQKeyboardManagerSwift/IQKeyboardManager/IQKeyboardManager+Position.swift

@@ -651,8 +651,8 @@ public extension IQKeyboardManager {
         })
 
         // Restoring the contentOffset of the lastScrollView
-        if let textFieldView: UIView = activeConfiguration.textFieldViewInfo?.textFieldView,
-           let lastConfiguration: IQScrollViewConfiguration = lastScrollViewConfiguration {
+        if let lastConfiguration: IQScrollViewConfiguration = lastScrollViewConfiguration {
+            let textFieldView: UIView? = activeConfiguration.textFieldViewInfo?.textFieldView
 
             activeConfiguration.animate(alongsideTransition: {
 
@@ -686,8 +686,8 @@ public extension IQKeyboardManager {
                         if !scrollView.contentOffset.equalTo(newContentOffset) {
 
                             //  (Bug ID: #1365, #1508, #1541)
-                            let stackView: UIStackView? = textFieldView.iq.superviewOf(type: UIStackView.self,
-                                                                                       belowView: scrollView)
+                            let stackView: UIStackView? = textFieldView?.iq.superviewOf(type: UIStackView.self,
+                                                                                        belowView: scrollView)
 
                             // (Bug ID: #1901, #1996)
                             let animatedContentOffset: Bool = stackView != nil ||