fix(#23): ios scroll insets not preserved when offset is applied

mateusz1913 · Sep 26, 2021 · 211aa0f · 211aa0f
1 parent cff6d92
commit 211aa0f
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/ios/AvoidSoftInputUtils.swift b/ios/AvoidSoftInputUtils.swift
@@ -70,11 +70,14 @@ func computeSoftInputOffset(softInputHeight: CGFloat, firstResponder: UIView, co
 
 func applyOffset(focusedInput: UIView, rootView: UIView, bottomOffset: CGFloat) -> MaybeScrollInsets {
     if let scrollView = findScrollViewForFirstResponder(view: focusedInput, rootView: rootView) {
-        let contentInsets = UIEdgeInsets.init(top: 0.0, left: 0.0, bottom: bottomOffset, right: 0.0)
+        var newContentInset = scrollView.contentInset
+        newContentInset.bottom = max(bottomOffset, scrollView.contentInset.bottom)
+        var newScrollIndicatorInsets = scrollView.scrollIndicatorInsets
+        newScrollIndicatorInsets.bottom = max(bottomOffset, scrollView.scrollIndicatorInsets.bottom)
         let scrollContentInset = scrollView.contentInset
         let scrollIndicatorInsets = scrollView.scrollIndicatorInsets
-        scrollView.contentInset = contentInsets
-        scrollView.scrollIndicatorInsets = contentInsets
+        scrollView.contentInset = newContentInset
+        scrollView.scrollIndicatorInsets = newScrollIndicatorInsets
         return MaybeScrollInsets(scrollContentInset: scrollContentInset, scrollIndicatorInsets: scrollIndicatorInsets)
     }