diff --git a/lib/ios/reactnativeuilib/keyboardtrackingview/KeyboardTrackingViewTempManager.m b/lib/ios/reactnativeuilib/keyboardtrackingview/KeyboardTrackingViewTempManager.m index 385d1cd945..2bc47087ab 100644 --- a/lib/ios/reactnativeuilib/keyboardtrackingview/KeyboardTrackingViewTempManager.m +++ b/lib/ios/reactnativeuilib/keyboardtrackingview/KeyboardTrackingViewTempManager.m @@ -207,7 +207,9 @@ - (void)initializeAccessoryViewsAndHandleInsets { if(_scrollViewToManage == nil) { - if ([NSStringFromClass([subview class]) isEqualToString:@"RCTScrollViewComponentView"]) { + if ([NSStringFromClass([subview class]) isEqualToString:@"RCTScrollViewComponentView"] && + subview.superview != self) { + UIScrollView *scrollView = [self extractUIScrollView:subview]; if ([scrollView isKindOfClass:[UIScrollView class]]) @@ -434,9 +436,7 @@ - (NSArray*)getAllReactSubviewsForView:(UIView*)view - (void)_updateScrollViewInsets { - // Because our view is now being transformed inside it's superview (from RN77 it inherited a RCTLegacyViewManagerInteropComponentView as superview) we no longer need the scrollview to also update because it's inside our view - return; - /*if(self.scrollViewToManage != nil) + if(self.scrollViewToManage != nil) { UIEdgeInsets insets = self.scrollViewToManage.contentInset; CGFloat bottomSafeArea = [self getBottomSafeArea]; @@ -483,7 +483,7 @@ - (void)_updateScrollViewInsets insets.bottom = bottomInset; } self.scrollViewToManage.scrollIndicatorInsets = insets; - }*/ + } } #pragma mark - bottom view